[automerger skipped] Merge "Warning / Info icon added for the VPN Preference" into sc-dev am: 3bc4e93029
-s ours
am skip reason: skip tag Change-Id I59fd7765876fe58fe2c55929f711c04a45abbe09 with SHA-1 a7774a10e0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13960259
Change-Id: Ib081eeab0774262fa52115609325ac32a6b71601
This commit is contained in: