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

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

Change-Id: I2e8c9a6c8c997eeeaf3500da74d5c97b7db73eb0