Merge "Clear calling identity to grant CDM permission when checking device config." into udc-dev