Merge "Correct which DPC has the permission MANAGE_DEVICE_POLICY_CAMERA" into udc-dev