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

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

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