Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc am: 3616862f am:...

Merge "Fix gpuservice_unittest mem leaks" am: 79eaacdc am: 3616862f am: 8b2478af am: 603c4071

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



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