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

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

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