[automerger skipped] Merge "[Thread] add Android.bp for Thread flags" into main am: e19a753182 am: e5547186f5 am: 65f3a474f8 -s ours

am skip reason: Merged-In I88c993680976d2e10d672bfdbf45119f2db13868 with SHA-1 da8fac1edb is already in history

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

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