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