Merge "Fix NPE in revokePermissionsNoLongerImplicitLocked()."