[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: fccc9408 -s ours am: 5af25ab1 -s ours

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

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

Change-Id: Iab48d432f038e8a3b486479057ca8d3cc0ed4c02