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

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

Change-Id: Ic7368f7a877c8ec21ea6835a6ca1eaa96f83b5b1