[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4
am: d35d3e2446
-s ours am: 961d4b26b7
-s ours am: 8c89ac9027
-s ours am: ad3fef885f
-s ours am: 62694fefcb
-s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975
Change-Id: I34086ad2baee255f9413529edcfed89cdc95eb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: