Merge changes from topic "vpnmanager-events-T" into tm-dev am: 9b4d5b7f9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18116403

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