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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into rvc-dev am: ee714b66 am: 7e912bbe am: 1df127c1 -s ours am: bf12e453 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I813fd5eff37289759dec98550d8eb98eb551afae