Merge "Reduce synchronization in KeyguardService.wrap" into udc-dev