[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c427756f81 -s ours am: fcb688f6f2 -s ours

am skip reason: Merged-In I39bc668a5671cce94372063246c13bc09dd569fa with SHA-1 934500069b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/16279618

Change-Id: I74d0d78c98ccfac58eaba2b33aee00a58cdcb7c5