Merge changes from topic "am-42bfc4e9e925412abde60152207beaf7" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e6 am: 1f55532c -s ours
  [automerger skipped] Address leftover comments of ag/18112116 am: 29b1b5be am: 521df6a1 -s ours
  [automerger skipped] Rename vars of Ikev2VpnRunner am: 09eab9ca am: 44dee73a -s ours
  [automerger skipped] Send VPN manager event when there is a network error am: 41eb5674 am: 869abaa7 -s ours
  [automerger skipped] Send VPN manager event when there is an IkeProtocolException am: 19f71afa am: 20dbf82c -s ours