[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: dddf0b2d -s ours am: 59834858 -s ours am: 25287be9 -s ours am: 8c48b2e9 -s ours am: 0ca7266f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie904e1d1b1f5bddc975f62e97007c95f35356fb5