[automerger skipped] Improve carrier id testability am: 4b7e8703 am:...

[automerger skipped] Improve carrier id testability am: 4b7e8703 am: 6909d49c am: b9d95f07 am: 32966fa4 -s ours

am skip reason: Change-Id I3d2d03d4f3b077900d614fb9519916150ec6a67b with SHA-1 1a68dae2 is in history

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

Change-Id: I8de5941883bee3f692fb2c6a0e36b83846c55072