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

Merge "bp2build converts java_version property to javacopts attribute" am: 775b44fa am: f4b263c4

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



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