Merge "Fixed gpuservice_unittest mem leaks" am: 8de18018ae am: 86a3e60c4d am: 403e26a6f1

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

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