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