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

[automerger skipped] Merge "Improve handling MediaCodec linkToDeath() resource manager" into rvc-dev am: 6542f433 am: 36706a3b -s ours am: e60124df -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: Ib36eda842de00e220a635b691239b218bc717a8d