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

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