Merge "Fix re-entrant issue in Keyguard / Mixed handler" into udc-dev am: b4b4f2042d am: 13ab0ed67a am: 9333c820b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23638653 Change-Id: I95ce0d9a4fc1d624ae9b68e2ee919f003b64850d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: