Merge "Switch to JDK 21" into main am: 092c3a56fb

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

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