Merge "Bp2build support for sdk_version and java_version." am: a3c029e7 am:...

Merge "Bp2build support for sdk_version and java_version." am: a3c029e7 am: f8ebe7f3 am: e9ab0a3c

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



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