Merge "dumpstate: Properly handle unfound pid" am: 090d0e3389
am: 41c7b3c933

Change-Id: I3854f489eb608d064d7d7750313e94a19fde9451