Merge "Revert "Dismiss Auth Biometric Prompt when expanding shade"" into tm-dev am: ec8a221a4f am: f50f236356
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18789966 Change-Id: If912e482b695014a24cd31e3e5857bdd38b19c45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: