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

Change-Id: I93d8d976705e382bf2ab0db3545ab847c1291450