Merge "[Thread] add ServiceManagerWrapper" into main am: 4a7c729a27

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

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