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

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1940559

Change-Id: I1fbed68e7fcde2cb73ca5e0fdfeee5f945a5d899