Merge "hwc2: Fix VTS Test Failure for readback tests" into display.lnx.5.1