Merge "Separate timestamps in AdaptiveDecodeTest" am: fd2e17865a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aeee9f57d977fccf9a563000e85598f7641e680