Merge "Show HUN layout on lockscreen when FSI permission is denied" into udc-dev am: 831cd1caba

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

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