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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into oc-mr1-dev am: ea92c694 -s ours am: 89dec641 -s ours am: 0b4d5dfd -s ours am: 33c6aef7 -s ours am: 21b25080 -s ours am: 26ceb93c -s ours am: 3960b706 -s ours am: fe8866e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia414d8a45c26ec8c211f9b2d0178899f1563e239