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

am skip reason: subject contains skip directive

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

Change-Id: I0334a21ffd728a6aea1bb59ec1a7ff85352ad374