Merge "Fix deadlock in getOneTimePermissionUserManager()."