[automerger skipped] Merge "Merge Android R" am: ed293f028d -s ours am: fcb79c23d2 -s ours

am skip reason: Change-Id I1da6f480b01ed3afe1fa4fb5af78044945a51540 with SHA-1 f0c35e00ec is in history

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

Change-Id: Iefdfd09ba34004a140c8d5f84e904b7089f6ab1d