[automerger skipped] [Settings] Move display of VPN version into summary text...

[automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a4 -s ours am: eefa7371 -s ours am: fcdc4a4d -s ours am: b17f5872 -s ours am: f52fc378 -s ours am: 0293401f -s ours am: aa208d9a -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e661 is already in history

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



Change-Id: I8b87d348de4cb0e424d2f8ced8b042fe2ddac0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>