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

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

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



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