[automerger skipped] Merge "Make sure udfps bouncer always shows when requested" into sc-dev am: 9d3e7391aa -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: I6a17fd9fcd9a2f3ab0470cfa16713beba47741a5
This commit is contained in: