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

Change-Id: Id7b0881d24789e89499e7ee2e320525f351b42b4