Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e6 am: 1f55532c

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



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