Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc99 am: 3616862f27 am: 8b2478af54 am: 603c407107

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

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