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: I9b0f941ad2554982528c6a4de0b1add61af9cef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>