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 am: 1ddfa6f6

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



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