Merge changes from topic "ks2_vpnprofilestore" am: 8914e1e30d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96310ef2eddb92201b4fd06ce9bafb0a0532c162