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

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

Change-Id: Ib53447f0ed40505b743b7a107bbb1f54b0c63370