Merge "Fix race condition causing flakiness in HfpClientConnectionServiceTest."