[automerger skipped] Merge "SF: hwvsync on for more samples on recalibration"...

[automerger skipped] Merge "SF: hwvsync on for more samples on recalibration" into rvc-qpr-dev am: 50c34a1b am: 63e47257 -s ours

am skip reason: Change-Id Ic3190822e38c5a24d3445ea89ef6d7e34a590077 with SHA-1 b818bfaf is in history

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

Change-Id: I5486f22b4acf7859d5a28185b77716c1892029b6