[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 24c76821 -s ours...

[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 24c76821 -s ours am: e58ee7c8 -s ours

am skip reason: Merged-In Ibe3499c903c861fddba60acddda2ff563654a2ba with SHA-1 b630ec9b is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2989113



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