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

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

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