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

[automerger skipped] Merge "Prevent offload underrun during active playback." am: ebf3ab9c am: 4a56e8b8 am: 056d4f61 -s ours am: d0b408cf -s ours

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

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

Change-Id: I6c7ecf592ec2f447c45163de842226fdffaf41c4