[automerger skipped] Merge 24Q4 into AOSP main am: ba73e1e43d -s ours am skip reason: Merged-In I3874ee7d7eca14f13fb37d67fff738bcd55372b8 with SHA-1 3fda7aeb90 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/3413999 Change-Id: Iab7e1969724264730c74b8aafac66ba9e2c21596 Signed-off-by: Automerger Merge Worker <[email protected]>