Merge "Keystore 2.0: Extend the functionality of the Vpn profile store." into sc-dev