Merge "Reduce synchronization in KeyguardService.wrap" into udc-dev am: 97f833d979 am: e6023bb2a2 am: 26a8727f2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23673463 Change-Id: Ibc8f0d1db16a8356637efc403f6988cbfefcb444 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: