[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: a30d78f715 -s ours am: 8101a8cec7 -s ours

am skip reason: Merged-In I41300e2f6e2d916f8084c23a5e31a33f70f7d5e2 with SHA-1 772062e9ae is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/3258613

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