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

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

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