Merge "Use put/removeAllPackageOverrides in AppCompatOverridesService"