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: 964902ff am: 9f084c49" into udc-qpr-dev-plus-aosp am: fbd4ce29

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



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