Merge "Make ThreadNetworkController.setTestNetworkAsUpstream require NETWORK_SETTINGS permission" into main am: ba2480bb2e

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

Change-Id: Ib2c2e83d74de35266425e48c0c589bec1dfce964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>