Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc99 am: 3616862f27

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

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