Merge "Revert "Switch to JDK 21"" into main am: bfa20d7e15

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

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