[automerger skipped] Merge "Improve handling MediaCodec linkToDeath() resource...

[automerger skipped] Merge "Improve handling MediaCodec linkToDeath() resource manager" into rvc-dev am: 6542f433 am: e15bc27b am: 14a7bf4c -s ours am: a1a6d615 -s ours

am skip reason: Change-Id I7436e064b63a9b1833f0a2126319674d5ab50828 with SHA-1 ca0fdf20 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0064c6a0f0c76362a407fdf513939eec33dfdfa4