[automerger skipped] Merge "Fix VPN settings UI to validate IPsec Identifier" into rvc-dev am: 47d4979c27
am: b98eac9272
am: 0f77f25e8d
am: d0b0bdae89
-s ours
am skip reason: Change-Id I6536652a60244c3fde3f65211f9d0709145c6cd9 with SHA-1 3bd20b6bc9
is in history
Change-Id: Ieba1af2793d422a2c52572970e75fcfce6d15cea
This commit is contained in: