[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into oc-mr1-dev am: ea92c69465 -s ours am: 89dec64125 -s ours am: 0b4d5dfdc9 -s ours am: 33c6aef7c1 -s ours am: 21b2508081 -s ours am: 0b0a4e1c1c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68fe79ea5c6f6bf16c281619cb87c8b6efd73702