[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 3d7a3741 -s ours am: 54fb998d -s ours am: a84dbb60 -s ours

am skip reason: skip tag Change-Id Ic7cfb252d1f08f15b0e88d55e4297f992071b9ed with SHA-1 03935271 is already in history

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

Change-Id: Iecf2a3bb64bebdedebe5a697d7e3274924154338