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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7ccce7ca250629c85634190be57f13d508005c1