[automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082
-s ours
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972
Change-Id: Id8afd54caba477f5fb31a032fe2a1be81f903ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: