am c7c3697c: Merge "Fix flaky AudioTrackTest#testPlayStreamData" into mnc-dev

* commit 'c7c3697cdbd7d09dc42fe32c4aee361b59ddca12':
  Fix flaky AudioTrackTest#testPlayStreamData