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

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



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