[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: af3074b6 -s ours am: 90345322 -s ours am: 2a75b46e -s ours am: 7633880c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1ccda41a9ef97d29e76474bc6ba86d4c96d8c12a