Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e am: b6b78798a4 am: 7771132ca8 am: 15000df8f0 am: f1a5f750eb

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

Change-Id: I577dc8b14e0c6975734206d793bec6a564808527