[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 skip reason: subject contains skip directive

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

Change-Id: Ib983840ebdf152b41c4e581e152a2a9bea0f2add