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

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



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