Merge "audio: Fix AudioTrack stuck while interrupting waitStreamEndDone" am: 0384ae1bf0 am: 4be61cd210 am: 1eec4f36ab am: b1e892e398

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

Change-Id: Idd1baa8d427fda169e73b3b5b244ea97312f56c2