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

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



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