Merge "Set JAVA_HOME for runtime via soong AndroidTest.xml template" into main...

Merge "Set JAVA_HOME for runtime via soong AndroidTest.xml template" into main am: ff334210 am: 584436fa

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



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