Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev