Merge "Remove workarounds to use core platform API" into sc-dev am: 169f43d117

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

Change-Id: I4e3a3ed12857c9bb59097c79c0b95f68c06d0540