[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after...

[automerger skipped] [RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability. am: abb7ad47 am: 2e056f19 -s ours am: 6fc9c6ed am: bb15caf7 am: 30f37855 -s ours am: a49373f3

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

Change-Id: I61925f634d61a8dbd590dc876a138cd0b2bdfa13