Merge "Fix race condition causing flakiness in HfpClientConnectionServiceTest."
tree: 782434547e318b59ca34b955177b7a0a7ff86088
  1. android/