Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054 am: 3ebbbd99

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27163476



Change-Id: I81e95990fee34a786c79024154687dbf456d0cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>