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

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



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