[automerger skipped] Merge 24Q3 to AOSP main am: 77d009fee2 -s ours am: 2056e598db -s ours

am skip reason: Merged-In Ia2f80a011daaf4921032538dea98627c83d30843 with SHA-1 00ad9ed676 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/3255131

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