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 am: 6b95740d

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



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