Merge "Remove MobileNetworkSettings from phone app" am: 5bf8257388 am: bc31dc083e
am: 71dfbef70b

Change-Id: Ie13d9a555a674a4aa8774cb85fe215d13d2fcb6b