[automerger skipped] Merge "Rename getApnTypeString" am: d6122dfb am:...

[automerger skipped] Merge "Rename getApnTypeString" am: d6122dfb am: 80b16621 am: ed9c76d7 -s ours am: 6286d4d9 -s ours

am skip reason: Change-Id Id5a0aa8bc67b65c87e4e37ee8b070c9664f9e6d0 with SHA-1 0bc5aaa3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia49d6dfa6e6a415066535d260ff87a575d58a4f3