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

Merge "Revert "Dismiss Auth Biometric Prompt when expanding shade"" into tm-dev am: 4332951c am: 5d02f218 am: 2e6039cd

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



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