Merge "Keystore 2.0: Add policy for vpnprofilestore"