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

am skip reason: Merged-In I3edc408507869887b1b5faa8c28e481ec65a32b0 with SHA-1 eb039b945d is already in history

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

Change-Id: I4a6c3d388057645a1e36c975352dacca83c1bddc