Merge "Support set test network to tethering upstream" am: 473d864d20 am: da862b2a35

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

Change-Id: Ic19a794d67f480c19caac77ad5747fcbffc89167