Merge "Merge "graphics: ignore/reduce spurious vsync in VTS" into oc-dr1-dev am: d1231716d3 am: 58fbba63b7" into oc-mr1-dev-plus-aosp