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

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

Change-Id: Ib4308721830956d8e1243eb2c2efcc045bb8e95c