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: 411f8023

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



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