Merge "audiotrack_tests: Reduce wait time during playback" am: eac83464 am:...

Merge "audiotrack_tests: Reduce wait time during playback" am: eac83464 am: 76793ecc am: 23c06c8f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2259662



Change-Id: Ie00f9e3d1426dd3a76f472f72851d9ab7c6e8b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>