[automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d
-s ours am: 96fe347312
-s ours am: 83e4693075
-s ours am: 8f9ade3eaf
-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: I35164868ba8f300bf72ca5c21930fcfcc19d91c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: