Merge "signal_catcher: Only notify tombstoned when we're using it." am: a97772fe0b
am: 82b2cd5ead

Change-Id: I56b7fd7a53923eae6079c9a1e42b2f30164a3513