[automerger skipped] Merge "Automatically set IPsec tunnel interface as up"...
[automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b0 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 041bdf88 is in history
Change-Id: I10aae07c044231d9b6fcdd61488a146b21d8dd8f