[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: d1b71a34 -s ours am: 51d0819f -s ours

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

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



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