Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f am: fde3c6d74a
am: 185275e0ad

Change-Id: If1956964597ad1885dde00f23c55a4492f867977