Merge "Allow experimental use of Java 21 by default in makefiles" into main...

Merge "Allow experimental use of Java 21 by default in makefiles" into main am: 0aeb964b am: f3aab9de

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



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