am 6151a9ef: (-s ours) am f72b0e44: Merge "DO NOT MERGE Add A2DP and Headset connection stress tests." into gingerbread

Merge commit '6151a9ef232b9d4d2b38761159f49181679a6a17'

* commit '6151a9ef232b9d4d2b38761159f49181679a6a17':
  DO NOT MERGE Add A2DP and Headset connection stress tests.