Merge "Update vpn icon from setting gear to vpn key." into oc-dev
am: 74327fa4f0

Change-Id: Ib711284c7071766d516d5b0e653f1b01da0f13bd