[automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b0853 am: bae6535b am: bb5ebce8 -s ours am: e0a303f6 -s ours

am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf841 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I190e05d204b477e1b34f361406679bc042ec073e