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

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

Change-Id: Ib01aef0aac9fffb297fc581295b0255692ab43ca