Merge "Make sure udfps bouncer always shows when requested" into sc-qpr1-dev...

Merge "Make sure udfps bouncer always shows when requested" into sc-qpr1-dev am: 40b77ace am: a128db6f am: 110e736d

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

Change-Id: Ieb8ac7722f7f3f5c3cb29c0b14f74129d851c7a4