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

Merge "Merge "Separate timestamps in AdaptiveDecodeTest" into android11-tests-dev am: d982ebf9" into android12-tests-dev am: 78f16278

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



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