Merge "Merge "Revert "Dismiss Auth Biometric Prompt when expanding shade""...

Merge "Merge "Revert "Dismiss Auth Biometric Prompt when expanding shade"" into tm-dev am: 4332951c am: bfe81b48" into tm-d1-dev-plus-aosp am: d626d71b am: a4e2508d

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



Change-Id: I0b65b8158c878e8d237b3a4dc0e32273ca5dc69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>