Merge "SF: hwvsync on for more samples on recalibration" into rvc-qpr-dev am: 50c34a1bb3

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

Change-Id: I9e50ed9ef253ce540674211e52f368b5b4331dad