Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 6ebb4df635
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456 Change-Id: I4c2ea858d5802c95d3166275151f45f3db01f400
This commit is contained in: