[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO...

[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 9c168587 -s ours am: 55494961 -s ours am: 7e5a42e8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iacd6c7f73975f17d2ee6ed4c7db1fef59688fedf