Merge "Add shims for ConnectivityFrameworkInitializer" am: eef90cfe41

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1962783

Change-Id: Ia80b56cff676068fc2eed0a736ebac24a3f12d2e