[automerger skipped] Merge "Use carrier key from carrier config" am:...

[automerger skipped] Merge "Use carrier key from carrier config" am: c2fd2d0d am: c43146ee am: 254c5e8f -s ours

am skip reason: Change-Id I8e855cca847d65276bfb34a797f5a2fd076a0763 with SHA-1 6c3d460a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I575680c0847d88ed8724ca44aabbefd0cebed97e