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

Change-Id: I5405a7657ef5f1962bda3d9f9287e1e4a5dde495