Merge "Update VPN tests to mock out createAttributionContext" into udc-dev am: e1b363b1f4

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

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