Merge "Add cleanup for KeyguardService.wrap()" into udc-dev