Merge "bp2build converts java_version property to javacopts attribute" am:...

Merge "bp2build converts java_version property to javacopts attribute" am: 775b44fa am: f4b263c4 am: c1a8f931 am: 546c3c74 am: 70108197

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



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