Merge "SF: update VSP timebase on error condition" into rvc-dev am: 9b2526e50d am: 7b69963494

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

Change-Id: Ib1377fed1bcd9ef2766787c027586b8529d51dcd