Merge "Pause faster during audio underrun" into tm-qpr-dev am: b127211d am: d5a85fa3

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



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