Revert "Fix memory leak" am: 9f93379c6b am: fce1c20220 am: b9c143f3a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/12467779

Change-Id: Icb5973472023f6693cf235862d55091f9d19aba2