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

am skip reason: Merged-In Ica83671c2c0892f282c26ba3c96f993a0b6fe699 with SHA-1 9cabf2612f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/27273329

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