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

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

Change-Id: I7fb51109b0b25792df5dc5b66e38835dc895ccce