[automerger skipped] Merge "Merge stage branch to development trunk." am: a5155129a9 -s ours am: 46f40a1867 -s ours am: e2b1314bee -s ours

am skip reason: Change-Id Iaeca9b46eb05073fc497dc29926f04aaf485b396 with SHA-1 ba0de0dcf3 is in history

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

Change-Id: Iea4f4915f88fe8664b240e59a8f82f1c5bfeb710