[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: c87f6bb2 am: 9a2b152a -s ours am: e1e347b2

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

Change-Id: Id2a14533254478ee6c3cb8f5aa64f6958b78b01c