[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7532f3215c -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: I6a37273174fd66d96a3ce4e5f401611c7cb6bc24
Signed-off-by: Automerger Merge Worker <[email protected]>