Merge "Change cross user permission for MANAGE_DEVICE_POLICY_LOCK." into main