[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 5c87d5f316 -s ours am: 4f13493f73 -s ours am: 4c100ad41f -s ours am: bf85d6df35 -s ours am: 1152805399 -s ours

am skip reason: Change-Id I8e584c831e6dbe9e001535023d750b44e90f8538 with SHA-1 d4bb1865bc is in history

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

Change-Id: I75793b0f3973b82cce226edaae7c2b05b31a0b11