Merge "AudioTrackSurroundTest: relax jitter test to match CDD" into nougat-mr1-cts-dev