Merge "Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am:...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: I703d9873e8399a933be086533563a0ec310e057a