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

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

Change-Id: Icb0e92af5b7593dbe1bddeb8f2177044a97fdaf6