Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc99

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2103864

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