Fix use after free issue am: bf0d7ca7e4 am: 2688c3b10f am: e11559dbd5

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

Change-Id: I571e76eca7154e15be3fd343a894614b1c0799a6