[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee
am: d7a50cb62f
am: d6cb162baa
-s ours am: 7242fdf8e4
-s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b
is in history
Change-Id: I8dbcd16262f35c63a57e9c2d5cc4b055a043e7df
This commit is contained in: