Merge "Mock more resources for VPNs." am: 16040b1833 am: cfcb564fb5

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

Change-Id: Icb6e8374e85d63de8626917d65edeb1c59006c23