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

Merge "Revert "Revert "Dismiss Auth Biometric Prompt when expanding shade""" into tm-dev am: eadcd22e am: 213d92ed am: 3708f36a

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



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