[automerger skipped] Merge "[Thread] add Thread aconfig_declaration to...

[automerger skipped] Merge "[Thread] add Thread aconfig_declaration to java_sdk_library" into main am: 22074a3e -s ours

am skip reason: Merged-In I8a71f4ee49cc68a9512f432e454469200f2a5058 with SHA-1 7fd35e54 is already in history

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



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