[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc am: eb0aebcf -s ours am: 9f953007 -s ours am: 18f143db -s ours

am skip reason: Change-Id I689e1cc8a68b980d68b1d6ef1d715203db078dc2 with SHA-1 03a29a69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11882406

Change-Id: I6e2376dad38d6fad4f170e99ecea88846c2f574a