Merge "Clean up logs in DevicePolicyManagerTest" into rvc-dev