[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update uid state based on...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update uid state based on capability field" into rvc-dev am: 051ea37d am: f146fc80 -s ours am: 4592c32f -s ours am: 3b2f0dc2 -s ours am: 02cbe9bb -s ours am: 9c55334f -s ours am: 1b6ca6fe -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23666360



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