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

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

Change-Id: Idef4258f5de61db0113190a31a3b869f519e05ac