[automerger skipped] CP bugfixes from ag/13300921 to QPR3 am: 0ca780c9 am:...

[automerger skipped] CP bugfixes from ag/13300921 to QPR3 am: 0ca780c9 am: b05b83ae -s ours am: 5778a71b -s ours

am skip reason: Change-Id I8148850ea80d5a05c9e9b4b7de3c2b2b87131c14 with SHA-1 072959f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d4206cd20269e4224c81f440e3cdede1a2d999