[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 56fb32d8e3 -s ours am: 457a960619 -s ours

am skip reason: Merged-In I320e8846d90e44b22ab5fe2a4afb69e711e38ba9 with SHA-1 fad091f839 is already in history

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

Change-Id: Ib9318991fb9e3efa07374221f40a2441ad02cae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>