am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for...
am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '6aee4761':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."