Merge "Public SIM_APN_URI uri and deprecated mcc, mnc, mvno_type, mvno_data" am: d839b0d384
am: faf8c714b7

Change-Id: I8e043242130824f6702b765cae8596c0b431d06d