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: I2ee29b76f2cb1e1c7bd7b5cfd2afafe13df465fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>