Merge "Modify VPN unit tests to include SDK sandbox UIDs." am: fc43f671dc

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

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