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

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

Change-Id: Ica2dee2ca9ea5796a2dc167cebda4d412e27dc54