[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: bd1bcc2ed4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9a7472c7f5a548822b110ad9352271ba054893e0