Merge "Do not trigger a disk write violation during dumpsys gfxinfo"