Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab am:...

Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab am: f543f7ff am: abc29d84 am: b6b78798

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

Change-Id: I6bad4e5adfeba9baa9d6756f46f5867394c4a3c6