Add shims for ConnectivityManager am: 7a96448ea9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff564dcd417f10f9e29ef4d9a93f7cdcaedbc059