Avoid leaking RenderEngine am: 5eb07e3b88 am: f35139f446 am: bd2a6f1b83

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3311018

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