[automerger skipped] Merge "Hide IKEv2 VPN options if not supported" into rvc-dev am: 5e2f733aee -s ours am: 03bf3af139 -s ours

am skip reason: Change-Id I3ef2e6144371596380351341e58c4ee84d49f39d with SHA-1 149cd3dd77 is in history

Change-Id: I5aa381f256c38f4e944147184ef03112769d37ed