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

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



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