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

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