[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am:...

[automerger skipped] Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc am: eb0aebcf am: 8181ac26 -s ours

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

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

Change-Id: Iaab28c4879ac7eef0a9e1c4f9a7fecc92b2b998f