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

Change-Id: I6e97cbef6612312029060a3182d4697839b0d651