[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 -s ours am: efbe51be -s ours am: ee810965 -s ours am: f6c93f4d -s ours

am skip reason: Merged-In I228f62a5e09017dbf985a614f2e42434238a220c with SHA-1 5a684c63 is already in history

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



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