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

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: fbf600b3 -s ours am: eb80dcb6 -s ours am: 6d5b9d90 -s ours am: 8acfd583 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1940734

Change-Id: I843b4e8bfbd4f2dd976b1c2fde3008f144222c06