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

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



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