Merge "Fix vorbis-specific workaround to only compare audio timestamps" into...

Merge "Fix vorbis-specific workaround to only compare audio timestamps" into main am: 630eb916 am: b89c7d18

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



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