Merge "Remove manage_device_admins and manage_profile_and_device_owner permissions." into nyc-dev