Merge "Drop platform_apis from android_library" into main am: e2e1dc10 am: 83e53650

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



Change-Id: Ib26f29d1326d4036dc15cc76384c2302f971eb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>