Merge changes from topic "am-547b842f937f42f486da79c3196bc39d"

* changes:
  [automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e6 am: 737ad913 -s ours
  [automerger skipped] Address leftover comments of ag/18112116 am: 29b1b5be am: fb6bc52d -s ours
  [automerger skipped] Rename vars of Ikev2VpnRunner am: 09eab9ca am: 1c636ee1 -s ours
  [automerger skipped] Send VPN manager event when there is a network error am: 41eb5674 am: d44fd2e2 -s ours
  [automerger skipped] Send VPN manager event when there is an IkeProtocolException am: 19f71afa am: e0a9f654 -s ours