[automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am: fab86f9cce -s ours am: efbe51bea1 -s ours am: ee810965ed -s ours
am skip reason: Merged-In I228f62a5e09017dbf985a614f2e42434238a220c with SHA-1 5a684c6362 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19415033
Change-Id: I0575706aed4bca0c0b062887cdba156ba907e0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: