Merge "Fix VTS fail for GraphicsMapperHidlTest" am: eef384a88e am: a5439e227c

Change-Id: I1e37a94d78f6315ea6e0d2a3c32eee0ee0c3f8f6