Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b84 am: 880e944b9c am: b0d5eeb893

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183496

Change-Id: Ia0716f7910b69c2223a4c491d9b3bb6a5f73f8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>