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

Merge "[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: 768cdfe6 -s ours" into sc-v2-dev-plus-aosp am: 8b72b4e3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I84d0d02d89f0ea59c6aae2e236bfc3bf465ca93c