Merge "Fix VTS fail for GraphicsMapperHidlTest"