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