Merge changes from topic "thread-configuration-api" into main am: bc9c0e2b03

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

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