[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: 88ced41d am: 823a2227 -s ours am: d0d3b6ca -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: I0b15bcbbd618dfc3ce4bc4be27a072b837c4bf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>