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

Change-Id: I62bce794bffab8425a4991484986481fd308933b