[automerger skipped] Merge "Merge Android R" am: 49cb13079f -s ours am: 7c370f18b7 -s ours am: 5e387fe086 -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: I2d6f7a2e08a2967d31daaadd35c2b94b4c6ba72d