[automerger skipped] Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e661 am: 1f55532c3e -s ours
am skip reason: Merged-In Iade04ede17b9371e530556acb2bd84c4b57c1581 with SHA-1 63b2a309ec is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18643036
Change-Id: I88978c835a3386782af410977ce20f3870766147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: