[automerger skipped] Merge "Make sure udfps bouncer always shows when...

[automerger skipped] Merge "Make sure udfps bouncer always shows when requested" into sc-dev am: 9d3e7391 -s ours am: 3da1d635 -s ours am: 8166d02f -s ours am: 68c4642b -s ours

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

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

Change-Id: Iabf1e14f67f4bc843b678f1803b4bcddec61f017