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