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

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



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