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

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



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