Merge "Do not disconnect existing VPN if seamless handover fails" am: 45fc56962c am: 1c33b078c8
am: 07287755f7

Change-Id: I5180d2ca98097f1b48c5020c2d639b77065a6717