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

Change-Id: I29538740df4794e0b427f31bc62a4380e40686f3