Merge "Avoid leaking RenderEngine" into main am: ad6288c8bc

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

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