Merge "Enforce DISALLOW_ADD_MANAGED_PROFILE"