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

am skip reason: subject contains skip directive

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

Change-Id: Ibe9918ca009d7dd7047f657ab5eee6ede35f1910