[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 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/+/13486147

Change-Id: I61793d04496a299273a7be864a4827f252794132