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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b2b124f955467a74be51252a967eeee388ecfb0