Merge "Remove obsolete java version environment variables" into main am:...

Merge "Remove obsolete java version environment variables" into main am: f2c51919 am: 3bc0e281 am: 92a9542f

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



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