[automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev...

[automerger skipped] Merge "Keep track of DeathMonitor cookies" into tm-dev am: 74770054 am: 3ebbbd99 am: fe984ebf am: aeb7d0f4 am: 5970512c -s ours

am skip reason: Merged-In I418cbc6baa19aa702d9fd2e7d8096fe1a02b7794 with SHA-1 49859a3b is already in history

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



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