Merge "RecordingActivityMonitor: remove spam from death events" am: 91d0f80387 am: 407f4c5c47

Change-Id: I85cbd7cecddc7e5c2c4f4e442edb4d60f50a45c4