[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am:...

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: f7e0243a -s ours am: cd56f582 -s ours

am skip reason: Merged-In Id86f2f897962fe1715989150fe6ec0f045aea2c1 with SHA-1 4c8c13c2 is already in history

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

Change-Id: Ieeb865b742be408f536e501b6d4732610f65d7c9