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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into pi-dev am: 71572d7a -s ours am: faa293a5 -s ours am: e2ef1b7c -s ours am: 43d188c5 -s ours am: a58b7bad -s ours am: 7585e574 -s ours am: 8524c25b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6ca6d70c6f9ac2690790d42601b6db97866548a9