[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: b41f2507ec -s ours am: f9e26a4373 -s ours

am skip reason: Merged-In I0af5291c0f8506eeb078ca1515249b9b1b6ff880 with SHA-1 e2ca493505 is already in history

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

Change-Id: I4fd3aa84852a06e113275a73ecb25ed6cc7759d4