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

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

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