Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a0 am:...

Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a0 am: b93e3b02 am: 11b0e7a1 am: 3292fc24

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



Change-Id: I6ed60bf4467d02851efcd48e09c8dc5dcd062ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>