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 am: c5a1b692

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



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