Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data"