Merge "Reland^2 "Target Java 17"" am: b0dc477ef7 am: 8fcec519ff

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

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