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

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

Change-Id: Iaf78ddfdbd4463918d2e028a7c3d7705f7b48b44