[automerger skipped] [DO NOT MERGE] am: ae487ada19 -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: I5e1f44a827fd74a6a420b910c85b27892969d7e8