Merge "Merge "Merge "Merge "Separate timestamps in AdaptiveDecodeTest" into...

Merge "Merge "Merge "Merge "Separate timestamps in AdaptiveDecodeTest" into android11-tests-dev am: d982ebf9" into android12-tests-dev am: 78f16278" into android12L-tests-dev am: b2d20c22" am: 82995b90 am: 5cdb2be5

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



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