[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 08f21857f9 -s ours

am skip reason: Merged-In I278e2814a41b1d42b337de06d1eb50911455f2a3 with SHA-1 ed912e19ba is already in history

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

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