Merge "Add strings and carrier config needed network service." am: a3ccb8d854 am: 0c2a5852f5
am: d7672c6f49  -s ours

Change-Id: I7ae9723f0390d2b477749f7f6f4c28160ffb1664