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

[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970 am: d35d3e24 -s ours am: 961d4b26 -s ours am: 8c89ac90 -s ours am: ad3fef88 -s ours am: a171ca84 -s ours

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

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



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