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: 5d02f218 am: 2e6039cd" into tm-qpr-dev-plus-aosp am: 5e4e133a

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



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