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

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

Change-Id: Ib01bbc0cfec540a6e811ac874c4e731734490dfb