[automerger skipped] Merge "Merge Android R" am: 49cb13079f -s ours

am skip reason: Change-Id I3ce47d83598d773b3bc180cc6a3aaa30498f7ccc with SHA-1 268fb3fe7b is in history

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

Change-Id: Iec01f5558eaabcba7e40da03ee4877f55f65373a