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

[automerger skipped] Merge "Fix possible uaf of play policy state" into qt-dev am: 2a41846f am: 8e3741aa -s ours am: 9a4d85f6 -s ours am: dcd63340 -s ours am: 3341f5df -s ours am: 1266550c -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/+/13486147

Change-Id: I471c7dbb54a5276804c39d9a74adf1ee3862ba24