[conflict] Remove usages of java_api_finder am: 4d14f77185 am: eafeac6f2e am: c8b2f7d9ee

Original change: https://android-review.googlesource.com/c/platform/art/+/2315923

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