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