Merge "Add mutex to the supplicant aidl_return_util to support multiple clients to the service." into main