Merge "Allow the modern way to get ConnectivityManager" am: 9e6c2c4396

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c8b2c5ceaeec03cf462a38e1da9339b6a27c28f