Merge "Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d am: 6ebb4df6" into sc-v2-dev-plus-aosp