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

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

Change-Id: If5ded91212d05756dc159f25a13fd39abbb1124c