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: I7f86ac5d4723e55e75d6ee5f500e2104dacc906c