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

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



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