[automerger skipped] Merge "Revert "[Thread] add Android.bp for Thread flags"" into main am: 61a823471f -s ours

am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history. Merged-In was found from reverted change.

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

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

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