Merge "Add shims for ConnectivityFrameworkInitializer"