Merge "Drop platform_apis from android_library" into main am: e2e1dc10 am: c886abf0

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



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