[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 skip reason: subject contains skip directive

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

Change-Id: I2c28a1a9706c4ee33ce73257ef27b1e00802806a