[automerger skipped] [DO NOT MERGE] am: ae487ada19 -s ours am: d66a732b4a -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: I272aa06a3ec65b1b2bd9f0ab75780fbbe14986f0