Merge "Change checkUidPermission and others in PermissionManagerServiceInterface to accept persistentDeviceId" into main