Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc99 am: 3616862f27 am: 8b2478af54 am: 603c407107 am: bc7e607def

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

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