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