Merge "Specify the expected VPN network callbacks." into main am: cd4258dcb1 am: 00509b52fe

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

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