[automerger skipped] Merge "Allow the modern way to get ConnectivityManager" am: 9e6c2c4396 am: 54d581ecc8 am: e5c399f7cf -s ours

am skip reason: Change-Id I18683c28bf05928a0ce5ddaf44671385b8d9e7f0 with SHA-1 23e1c2d7d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17de4b8fc61356caa4e31baaad60567fff8a1599