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

Merge "[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: 664589aa -s ours am: 0abbea8e -s ours am: bc303a89 -s ours" into sc-v2-dev-plus-aosp am: d7cbdce2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie08cc9a7c1616b7c2598853fee2cc8509566f7d2