Merge "Fix re-entrant issue in Keyguard / Mixed handler" into udc-dev am: b4b4f204

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



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