Merge "Update VpnManagerServiceTest to work with lockdown VPN main user changes." am: f738c40e8c

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

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