Merge "Separate timestamps in AdaptiveDecodeTest" am: fd2e17865a am: 80ae353d5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6c8dcc45b87f7ca9d5589a1fa3c54e8b9cc7742