[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 skip reason: subject contains skip directive

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



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