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: b48c3d92 am: f1b11351

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



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