Merge "[automerger skipped] Merge "RecordingActivityMonitor: remove spam from death events" am: 91d0f80387 am: 407f4c5c47 am: e9accecd1d -s ours am skip reason: Change-Id I085ee545a07c7d3ada05c575878998a0e76a135b with SHA-1 27c6887a9b is in history"