[automerger skipped] Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev am: bd9a65cca6 -s ours
am skip reason: skip tag Change-Id I2bee3ba100bfe636221264492a2ce98b6a664cd5 with SHA-1 3922249709 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960260
Change-Id: I8fb9d8472a41a83da01d71b7e9312c2fe729e34f
This commit is contained in: