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: I0bca095602c3000fe3f3b99698fba0961004d492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>