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

Change-Id: Ia8118ed17c844f7acf46572034d8bc3d35282008