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

[automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e661 -s ours am: 96fe3473 -s ours am: b3be027c -s ours am: 663715de -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae6 is already in history

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



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