Merge "Fixed gpuservice_unittest mem leaks" am: 34f8fc85 am: 93baab7e am:...

Merge "Fixed gpuservice_unittest mem leaks" am: 34f8fc85 am: 93baab7e am: 980c7d19 am: 6d2ccc04 am: 346ed7ef

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



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