[automerger skipped] Merge changes from topic "vpnmanager-events-T" into...

[automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e6 am: 1f55532c am: 7f60a6a8 -s ours

am skip reason: Merged-In Iade04ede17b9371e530556acb2bd84c4b57c1581 with SHA-1 63b2a309 is already in history

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



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