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