[automerger skipped] Merge "[Thread] update Thread settings screen" into main am: ba221ea50c am: 0ff02951c2 -s ours

am skip reason: Merged-In Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc with SHA-1 d454ac2963 is already in history

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

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