Merge "Don't clear timestamps when enabling HW vsync." into udc-qpr-dev am: 0357e58870

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23390738

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