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

Merge "resourcemanager: rework death handling" into main am: 2853e09e am: fce5d446 am: 589dc852 am: 39e1556d

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



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