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 am: bea4e3cf am: e002e7f6

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



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