Merge "Fix an issue that audio timestamp is set to 0" am: 1ebaccea21

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

Change-Id: I25d7b9cc75f4749f0500df56021ebcfb8eaed313