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

Change-Id: Ia38656940e0a058312d9bdf89841d1fe4258b0ba