[automerger skipped] Merge 24Q3 to AOSP main am: 6794691431 -s ours am: f34332afc1 -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: Ic9935a4e22bedce32a34f393bb14573ecd314786
Signed-off-by: Automerger Merge Worker <[email protected]>