Merge "Make sure udfps bouncer always shows when requested" into sc-dev am: 9d3e7391aa

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

Change-Id: I7693d5f95f26ad5dce627ac9021a81b5b8a58c8a