[automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27 -s ours am: 5fcc1340c3 -s ours
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 1c69a8282c is in history
Change-Id: Ifcf5100755adc105d4b0a00761faae1c619392a8
This commit is contained in: