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

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

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