[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: 66adfe2c57 -s ours
am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 ad2421fe5b is in history
Change-Id: I46089ec2ec9683733166701d5cf3969f8cb4db1d
This commit is contained in: