am 64edadda: am 66e97032: am 2e825c4c: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 2." into mnc-dev

* commit '64edaddaca2a20c5dafe24f7d9457e55b1345d7c':
  Don't display Custom for PHONE_TYPE=CUSTOM part 2.