Merge "Add PreferenceChangeListener to ApnSettings"