Merge "SF: update VSP timebase on error condition" into rvc-dev am: 9b2526e50d am: 58bf1b3535 am: d9599a51a7

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

Change-Id: I10433f35bba67f78faee714bfff89ad23c602350