[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours

am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660

Change-Id: I2901f53bf8a2102e736976e5e7e9f91152a7c7d8