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 am: 7771132c am: 15000df8 am: f1a5f750 am: 6bc37c5d am: 3ab5c761

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

Change-Id: I7cec7360cf1ee6cf7c26ca0a6ef38f51496492e3