Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." am: 78f7c04770

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie50ba58b6d067fdcaf18df5593898afef11a0aa3