[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs"...

[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am: fab86f9c am: 6c9d1050 -s ours am: cb9e8e12 -s ours am: 162f4db9 -s ours

am skip reason: Merged-In I486398111106b1a9551fb29f92ba7b4fe85f68c1 with SHA-1 a7ec0cbe is already in history

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



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