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

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

Change-Id: I3e4ac71aec439637c3527c16e4e22c6c4d05b224