[automerger skipped] Merge changes from topic "vm_gid_caps" into main am: 1391c906 -s ours

am skip reason: Merged-In I9ba974495383494d24a564c66249c78176eebca9 with SHA-1 b1a06182 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2944750



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