Merge "Invert the order of event sending and VpnRunner.exit()" am: 47b156d650 am: 2929e7629a

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

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