Merge "Remove usages of java_api_finder" am: 65b2ec8855

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

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