[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 21cbf088 -s ours am: 7b217b31 -s ours am: f52ac85e -s ours am: 09749ed5 -s ours am: 62d093b0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I95955e936c4dd243782c23c588fb029408f1ce3b