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

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



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