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: 42ebacfc

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



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