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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability." into pi-dev am: 85c8c0aa -s ours am: c4c8ea3c -s ours am: 7057eb55 -s ours am: 4e372600 -s ours am: 33715c29 -s ours am: e65f2d8d -s ours am: e4c3928e -s ours am: 4eb5a587 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic45faa2b35c3f2b68c5b70102d64ea4ff235595b