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

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

Change-Id: I8bafe3ec70b1b0fa3fe49d195ced8841da57863f