[automerger skipped] Merge "Fix AudioTrack cannot resume after underrun" into...

[automerger skipped] Merge "Fix AudioTrack cannot resume after underrun" into sc-dev am: e10d7a6b -s ours am: 774b815c -s ours

am skip reason: Merged-In I563162dd24ad2f56f898a239e8df848c7f80e122 with SHA-1 e2cd1dfa is already in history

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

Change-Id: Iedf74f8755aea92088baf994724cf53986b3dfe0