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

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

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