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

[automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e6 -s ours am: 345521bb -s ours am: c5ca68c2 -s ours

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

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



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