Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83 am: 31576aae7c
am: d976002dea

Change-Id: Iec53ef5f156b986a61a085a0a7c758574a78cee2