Merge "[Thread] fix flaky Thread settings tests" into main am: 5a7eeea1 am: 0b6c1a78

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081385



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