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

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

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

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