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

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

Change-Id: Ia6e33d18fe80c333d07c65a03f12c11fa0203d17