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

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

Change-Id: I455e0e16f4b9e35b7beb60ae2e9e7520332e4801