Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: 41870192e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92f3749b7e6de72fa256d1389627602523bf1a0c