[automerger skipped] Merge Android U (ab/10368041) am: 23c2c66b -s ours am: fdc4ecb3 -s ours

am skip reason: Merged-In I6f2adc199e9f511b63231ce1ff9558375234712a with SHA-1 f73fc368 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/vndk/v34/+/24183017



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