Merge "Skip mount /oem on GSI" into rvc-dev am: aec1debc65

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

Change-Id: Id1e7b856f8c3a645faba8d2af88fe28e8631a891