Merge "Do not disconnect existing VPN if seamless handover fails"
am: 45fc56962c

Change-Id: I76f63a9d1aa6e8fcee8038db9cfd7be2c2d6c8c9