Merge "Add shims for ConnectivityFrameworkInitializer" am: eef90cfe41 am: 048387b6c3

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

Change-Id: I2ddaf9bd1c3975c148f3ade6c17e368885cf4a9c