[automerger skipped] Merge "Update the golden image after building with JDK...

[automerger skipped] Merge "Update the golden image after building with JDK 21" into main am: 3cedc738 am: 7b77478b -s ours

am skip reason: Merged-In Ia238ca246c4607984beaaa229ec21f2181f6f6a8 with SHA-1 e43430ac is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2996136



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