Merge "Merge "Add UID states and capabiliites to FGS atom" into udc-dev am:...

Merge "Merge "Add UID states and capabiliites to FGS atom" into udc-dev am: 2a38a78c am: b2f892e8" into udc-d1-dev-plus-aosp am: d6395f92

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



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