[automerger skipped] Merge "AudioTrack: Fix offload timeout" am: 2526b75e...

[automerger skipped] Merge "AudioTrack: Fix offload timeout" am: 2526b75e am: 50861c35 am: 5b781a3c -s ours am: 6e265e02 -s ours

am skip reason: Merged-In Id662f533a7aa084fa8454592eee1efd562ac774d with SHA-1 45b8cbe6 is already in history

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



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