Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc am: 3616862f am: 8b2478af

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



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