[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93
-s ours am: d15869f014
-s ours am: dad1ee3deb
-s ours am: 0382c98491
-s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341973
Change-Id: I7ea32f8e2012cf0028a6ce2bf872ced1cdf13a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: