Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054e9 am: 3ebbbd99a3 am: fe984ebf99 am: aeb7d0f4ee

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

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