[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: c4a9fa2e -s ours

am skip reason: subject contains skip directive

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

Change-Id: If6d340e42acf740479525b479e8c6a5650d7c18f