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

Change-Id: Ib09462cb4494ec30819d3e5454c6af01cf5fb246