Merge "Fix biometric prompt will delay dismiss after long press power key"...

Merge "Fix biometric prompt will delay dismiss after long press power key" into udc-dev am: a9142c6a

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



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