Merge "resourcemanager: rework death handling" into main am: 2853e09ed1 am: fce5d4465a am: 589dc852fd am: 39e1556d4c am: 4639cfc5b7

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

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