Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2

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

Change-Id: I70380559fc3b7988f3958ded0d8b3f7aaf804539