[automerger skipped] Merge "Fix an issue that audio timestamp is set to 0" am: 1ebaccea21 am: ab80437e42 am: 48335cd382 -s ours

am skip reason: skip tag Change-Id I6582d62ea5b7e56a4da3c32c5dd5ec571931e149 with SHA-1 982816828f is already in history

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1640584

Change-Id: I2652f89c685f41606df7a7c4acb9aa07398014fa