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

Change-Id: I14a7e63dff47c24fbb88e79d9d641d530809da24