[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
am: eb0aebcffb
-s ours
am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 f8475cc49f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406
Change-Id: Ib99dd74be50c63016dbd106dac79e154cf984e09
This commit is contained in: