Merge "[Settings] Move display of VPN version into summary text" into sc-v2-dev am: 1026e410 am: 12287b2c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341970

Change-Id: I2b908084e6422e9ccbdba8fd5cf67bf123f3ec62