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

Merge "Merge "Revert "Revert "Dismiss Auth Biometric Prompt when expanding shade""" into tm-dev am: eadcd22e am: 213d92ed" into tm-d1-dev-plus-aosp am: 91f9598f

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



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