Merge "Make sure udfps bouncer always shows when requested" into sc-qpr1-dev am: 40b77ace8a

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

Change-Id: I9892399c5466a19ee4b75cc401ac340f3c3d476f