[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: ccfe30d014 -s ours

am skip reason: Merged-In Idb5d29f30cc2a59d283133df9d79634ee027fb3b with SHA-1 63de307483 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/27273749

Change-Id: I270a894806409318629fd4834877ed8907111845
Signed-off-by: Automerger Merge Worker <[email protected]>