[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f105610 -s ours am: 771b6061 -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: I6d9cfd58a9b57141e20fb435eb6db668e16fb576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>