Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev am: 6c99793491
am: 9368dd17ae

Change-Id: If130598e24ef0e6dc5ba1f02269995e123f6d470