[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: 500a739c -s ours am: 04bd2de5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I331bef66dfa282af06aad6c24dd54e8a3d6a2353