Merge "Reland: "Identify post-apexd crashing processes"" am: 54ef09c88e
am: 58386c1e6e

Change-Id: Iebe1167c43f883a8d105bd856ab266163918be07