Merge "Update Settings UI for IKEv2/IPsec VPNs" am: 9579a76913

Change-Id: I6578907688551efef77caca68a2e7cafa818a30b