[automerger skipped] [DO NOT MERGE] am: ae487ada19 -s ours

am skip reason: skipped by user rtenneti

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

Change-Id: Ib053fcc18961da9e00709d2bb26c99518abb3f2c