Merge "Reduce synchronization in KeyguardService.wrap" into udc-dev am: 97f833d9 am: 1a6c6cd5

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



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