[automerger skipped] Merge "Prevent offload underrun during active playback."...

[automerger skipped] Merge "Prevent offload underrun during active playback." into sc-v2-dev-plus-aosp am: 7df25f1d -s ours

am skip reason: Merged-In Ib60b7d049e159d0f32daa5e586ff92dc0bfd48ee with SHA-1 8f194f19 is already in history

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

Change-Id: If7e111ac238fe16cfbc0eea69efe593a31b60b35