[automerger skipped] Merge "Generate java_api_library from java_sdk_library"...

[automerger skipped] Merge "Generate java_api_library from java_sdk_library" am: d056a91b am: 7f225369 am: c477ea91 am: f6012eb5 am: 0c1c6c2d am: 80c72dc6 -s ours

am skip reason: Merged-In Ic1ead15b3d0bcb921ca8d31bcaeeb4cd9ee8715c with SHA-1 480943ff is already in history

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



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