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

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

Change-Id: I43272c1ebec4c759976bd81f7c08290c5e642f78