Merge "Add Thread#join to guarantee the termination of the thread" into main am: 976e52a2c4

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

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