Merge "Keystore 2.0: Extend the functionality of the Vpn profile store." into sc-dev am: 0855263453

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/14968529

Change-Id: Ie38f6aec92acfa26cc61109173f773fa4622a2b4