Merge "dumpstate: Add historical ANRs as separate entries in the zip file." am: 0bb4169799 am: 2168bda5f3
am: 1dbadb9c80

Change-Id: Icea14f5f9862b9ede2507190d870ad1417d0438d