Merge "dumpstate: always include last ANR as a separate entry."
am: 6147c1f6b6

Change-Id: I8f90dbec5373cc86ef90c332b776935a5230adbd