[automerger skipped] Merge changes from topic "carrier_name_api" am:...

[automerger skipped] Merge changes from topic "carrier_name_api" am: 3994f51d am: 5691ce56 am: acb75d0e -s ours am: 47f8ab77 -s ours

am skip reason: skip tag Change-Id I2eab917cf1bb28c8c55af7b53776c17bbb3de4d6 with SHA-1 6892f282 is already in history

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

Change-Id: I29357b12e839cd660478895ea563f8b43b36045b