Merge "Fix ThreadFeatureCheckerRule on U- devices" into main am: 7ab992b3c6 am: 3b7cfafdc5

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

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