[automerger skipped] Merge "[Settings] Move display of VPN version into...

[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d6 -s ours am: db51e0c0 -s ours am: ee79190b -s ours am: aa4b1c40 -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: I5541c238691c67733342ebd7bb6366fbd1223c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>