Merge "Adapt first time VPN connection warning to TV form factor" am: 2af1306a77 am: 601e1dd64c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652319

Change-Id: I392fe75794808f472b443d57ec6544d270364e3b