Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab99 am: f543f7ffc1 am: abc29d848e

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

Change-Id: Ic3e618a12eaac79e04857483ccb1cef606072079