[automerger skipped] Merge "Make sure udfps bouncer always shows when requested" into sc-dev am: 9d3e7391aa am: 626dd8aac3 -s ours am: be3c9dd8ca -s ours am: 27d8931525 -s ours

am skip reason: Merged-In Iac398a60ecf5137d0c3a8c77d700146e12fad0b7 with SHA-1 5a5cd54366 is already in history

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

Change-Id: I29fde1d697a925ee4a6deb2c1a718ec695aa4c51