[automerger skipped] Merge "Have a method to stop VPN and send event to VPN app" into tm-qpr-dev am: a7aa18c159 -s ours am: cd1265b459 -s ours
am skip reason: Merged-In I54b550e6f972a13f61cbcf15ee1fb9fe3c313d7b with SHA-1 395c0909dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19881696
Change-Id: I2b3aadd4458a2293790a4a5f32e651345ccd0158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: