[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7532f3215c -s ours am: 07c2d74470 -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: Iaf058b10eda9561895b9e31cfa41db8f2d78ffe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>