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

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

Change-Id: I723387761bff7539885bc192f4fd300d400fd5f9