[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability." into pi-dev am: 85c8c0aa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I903515f98137f78efebf3d048c6f105ac851391a