Merge "Export defaultJavaLibraryName() identifier" am: 7bfe443875 am: aa843fd78c

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

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