am a49cea63: am 033168b1: Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev

* commit 'a49cea63a080b7c5f884626ba3c0309cb6e49f99':
  Lockdown VPN handles its own connection teardown.