[automerger skipped] Merge "Use carrier display name from carrerId as backup." am: afc161ee
am: 20270f21 -s ours
am skip reason: change_id I3bce4ae0440bd34d6ecf673fbe687a3bb7564fb6 with SHA1 7cc0fec6 is in history
Change-Id: Ia52ac6889942fa936fdbe6b06d7b55647299612a