[automerger skipped] Merge "Show scrimmed bouncer from BiometricUnlockCtrl" into sc-qpr1-dev am: 82997b7ac9 am: 47b08ebd91 -s ours am: c90383b0f6 -s ours
am skip reason: Merged-In Ib3def01e7ffd04ac950f06cbee7d213927110b5b with SHA-1 80d6a378b9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16374638
Change-Id: I169c0c2d455b691151944378d533c6eda6462b49
This commit is contained in: