Merge "Fix an issue that the syncTimestampToDisplayLocked incorrect" am: c7abb66ea6

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

Change-Id: I963bccad53dd2650a4c093aa96d2bd1b45077358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>