[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability." into qt-dev am: a7917113 am: bdd6f616 -s ours am: 534493a5 am: 0b5d7ce5 -s ours am: c1d928bc

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

Change-Id: I78f81a84ab213e53a98c35da3e4824ff1bf75cef