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