[Thread] unify synchronous controller API for testing am: 62eac0132d

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

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