Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019

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

Change-Id: Iea8a7bbe63a16efc10733dd94cccc77560a7a058