[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into...
[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733a -s ours am: 03bf3af1 -s ours am: a89340bf -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd is in history
Change-Id: Ib64d3084d0c86ad92ea3438b3750fcb0e4b75f9f