[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into rvc-dev am: ee714b66 am: 7e912bbe am: 1df127c1 -s ours am: bf12e453 -s ours

am skip reason: skip tag Change-Id I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 e07417a9 is already in history

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

Change-Id: I942af7ef254d01ccdaf3640e720d25af5d651009