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

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