Merge "AudioFlinger: Fix direct output resource from being occupied for too long" am: e36dfbf38b am: d52ea144c2

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

Change-Id: I6a259e5dc1a445e231db8eda55c10d04f7cc81f6