Fix use after free issue am: bf0d7ca7e4 am: 9a0e52204b am: d3780d77ad

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

Change-Id: Ibda204f4e6cd85db215cb7f808179f468804c641