Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2 am: 62df9b8d06

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

Change-Id: I703593eab8e45bfaa861b93f8b274c2e86e19a24