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

Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07