[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 9c392805 to qt-qpr1-dev am: f0a7b0df -s ours am: c9d7a049 -s ours am: 5e86920f -s ours am: ed9b9341 -s ours

am skip reason: Change-Id Iab02eef23a9b34d3e5eaceaabc8affd3725f5f3c with SHA-1 9c392805 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e499d3446f8d549ed1486609e718d4dd67d707b