Merge "resourcemanager: rework death handling" into main am: 2853e09e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2684433



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