Merge "gralloc4-vts: fix Lock_YCBCR_420_888 test" into rvc-dev am: fa8e5f931a am: 5c0e070bf4

Change-Id: I4b3f17dd33161a5a27913795b61caaf57f8a5a8e