Merge "[HWAsan Test]fix use-after-free bug" am: 583e8058ab am: 8e51771815 am: f46eccfd3c am: 588a35474d

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

Change-Id: I8fe4a838afd7d93d40e285dd500ae6b44ebe4850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>