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

Change-Id: Id546428e9d376d20984cc299c382fa3749c13d31