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

[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68 -s ours am: e8097d44 -s ours am: 35c5b0b0 -s ours am: c058392a -s ours

am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e661 is already in history

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



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