Merge "Remove workarounds to use core platform API" am: 78dcc73e4c

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

Change-Id: Ia0f8f5ab44267b0007364e6c1959edf22c952300