Merge "Add additional java_api_library module to java testing" am: d1a038c1...

Merge "Add additional java_api_library module to java testing" am: d1a038c1 am: 8ce85df0 am: 115dae4d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410



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