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

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

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