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: I4b334c59dd9fe59ca212980e1b61a255d029bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>