Merge "Fixed gpuservice_unittest mem leaks" am: 34f8fc859a am: 93baab7e84

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

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