[automerger skipped] Merge "Pause faster during audio underrun" am: daa3ff8b...

[automerger skipped] Merge "Pause faster during audio underrun" am: daa3ff8b am: 0f8a9765 -s ours

am skip reason: Merged-In I515b63e4b8fbd885b19b129043ec99636153fabb with SHA-1 65e9001c is already in history

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



Change-Id: I0caf904aff74bffbf4c8ce7ac69944a1b7530ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>