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

Change-Id: I0fe486b37521df918120cca1233d299ec68ce84b