Merge "MonitoringCertTask no longer relies on software.device_admin"