Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
am: 0cdb8177ea

* commit '0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a':
  Add a branded VPN icon for quick settings and status bar.

Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf