[automerger skipped] Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117 -s ours

am skip reason: Merged-In Id448be03b679f832edb24f1b77f471227faf5268 with SHA-1 b2e919f9da is already in history

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

Change-Id: If14c8e0083cd4b3e673756a2bf6d455c0f88a39a