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

am skip reason: subject contains skip directive

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

Change-Id: I794963faf31cf2cd0cc7c8cbb38396ba91dcb553