[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 -s ours am: 12b1c790 -s ours am: 4b8db72e -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: Icd0cc29fb8f00f81298760c0b208795c93c40c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>