[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65
-s ours am: e23e126d40
-s ours am: 22ab70c511
-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: I5b40ab71e197b545a8dc85b9505149a0aad0a887
This commit is contained in: