Merge "Bug:PreferredNetworkModePreferenceController.java not being refreshed"