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

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

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