Merge "Ensure apps can't bypass FAS using UIJ." into udc-dev am: 632fa893 am: b6d2d6bb am: 0fdaf47b

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



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