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

* commit '6aee4761a826c3ef2793dc5c62d2451bd7450c61':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."