[automerger skipped] Merge "Fix possible uaf of play policy state" into sc-dev...

[automerger skipped] Merge "Fix possible uaf of play policy state" into sc-dev am: edb048c1 -s ours am: 00c81f43 -s ours

am skip reason: Merged-In I07cc93c255942d56e866d0b08fb786f154f6e0d3 with SHA-1 2c075c71 is already in history

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

Change-Id: Ibb1cd11c02ec3be635733e3b389e066b51e4aa20