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

[automerger skipped] [Settings] Move display of VPN version into summary text am: 96f58131 -s ours am: 3c651042 -s ours am: 5305cced -s ours am: 35328912 -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c32 is already in history

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



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