Merge "gralloc4-vts: fix Lock_YCBCR_420_888 test" into rvc-dev am: fa8e5f931a am: 9a333d6839

Change-Id: I58a79c546344561ec6e67b7871ca41c06ea3fe61