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

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

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