Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev