[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update uid state based on capability field" into rvc-dev am: 051ea37d0f am: f146fc80b9 -s ours am: 4592c32fe2 -s ours am: 3b2f0dc2b1 -s ours am: 02cbe9bb65 -s ours am: 9c55334f52 -s ours am: 55da10a923 -s ours am: b5e640b5c8 -s ours am: 03954a49e7 -s ours am: 57da3b8b8d -s ours am: 2f17314a6a -s ours

am skip reason: subject contains skip directive

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

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