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

Change-Id: I092c9b06535a4df77440e3a798bb079bc39418db