[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: 36ce0ecd -s ours am: 9259b8f4

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

Change-Id: I2446c5cc9101e742f9e36c733c0b1e0fb0935519