Merge changes from topic "thread-make-pretty-enhance" into main am: 34b57700cd am: 3f159cb372

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

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