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

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



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