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

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

Change-Id: I9f5b83c65c79f36ec356972022d840fe8938f5db