Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee...
Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee am: 57bf0315" into nyc-mr1-dev-plus-aosp
am: 19602e03
Change-Id: I30f6a5d528f9ad549d0ecdcc1ec6ae2a1f5ebb59