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

[automerger skipped] Merge "Merge Android R" am: 49cb1307 -s ours am: 7c370f18 -s ours am: 5e387fe0 -s ours am: e7e7391e -s ours am: 58d5261d -s ours

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

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

Change-Id: I0a3f6f8cf9b28835ed9e38f75d6fc7574b2c5cb7