[automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae6 -s ours am: 351e22f8 -s ours am: 79238cbd -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f58131 is already in history

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



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