Merge "gralloc4-vts: fix Lock_YCBCR_420_888 test" into rvc-dev