Merge "Update "Mobile network" strings for ODR. Changes include string re-phrasing and new strings added for later use." am: 33fc37f374 am: 971eb63daa
am: d17e9819ff  -s ours

Change-Id: I1650eda332ca26b2c47526c3c110a4ce088c1050