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

[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f -s ours am: d15869f0 -s ours am: eedfefab -s ours am: b82af15e -s ours am: da5f4be3 -s ours am: dcbe3315 -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: I92b180576845533321b73321e7a9c7ee3d83169b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>