Merge "Fix Biometric prompt is getting dismissed while receiving the heads-up...

Merge "Fix Biometric prompt is getting dismissed while receiving the heads-up notification" into udc-dev am: 5a0eb9c2 am: ceb9d272

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



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