Merge changes from topic "am-144bc4c012e9421c9e52671f3eb3ec58" into udc-qpr-dev-plus-aosp

* changes:
  [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: 160490e0 -s ours am: ac8a96ec -s ours am: 47dd45ab -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Update uid state based on capability field am: 7aa76ced am: 6ef06c8f -s ours am: 3fcdd728 -s ours am: bf9eafb3 -s ours am: 22f039c5 -s ours am: 7c5bedd6 -s ours am: 6760b8f7 -s ours am: d2b876db -s ours am: 0b3b2894 -s ours am: ccbc88c1 -s ours