[automerger skipped] Merge "Make sure udfps bouncer always shows when requested" into sc-dev am: 9d3e7391aa am: 1ee64c80c3 -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: I15939675a0f07b9e497ca3cc46a7ead25247a455