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

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



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