Merge "Fix VTS fail for GraphicsMapperHidlTest" am: eef384a88e

Change-Id: I346104d31743741ebac4c4fe1539179f3353d207