Merge "Update A2dpSinkStreamHandlerTest"