Merge "Fixed gpuservice_unittest mem leaks" am: 8de18018ae

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

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