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

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

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

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