Merge "AppPreferenceTest created for VpnSettings"