Merge "Fix Biometric prompt not close after opening notification using Quick...

Merge "Fix Biometric prompt not close after opening notification using Quick Tap" into udc-dev am: 86f46f50

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



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