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

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

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