Merge "Fix for trying to restore audio track after obtain buffer error" into...

Merge "Fix for trying to restore audio track after obtain buffer error" into main am: 1eee8744 am: 1e5ca7e7

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



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