[automerger skipped] Merge "Keystore 2.0: Renaming the vpnstore interface."...

[automerger skipped] Merge "Keystore 2.0: Renaming the vpnstore interface." am: ce7dffbc am: ab133bca -s ours am: 4d0fca2f -s ours

am skip reason: Merged-In Icd304ef621f0de52d6ebc415a0628d63f827fbcd with SHA-1 191b2064 is already in history

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

Change-Id: I16a915a5147e0985e51b852be53c9cc3952ab063