Merge "[RESTRICT AUTOMERGE] Fix possible uaf of play policy state" into rvc-dev am: ee714b664f

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

Change-Id: Ib50c374b92d646f06b794f398141a9d5dbb992f1