Merge "Fixed gpuservice_unittest mem leaks" am: 8de18018ae am: 86a3e60c4d am: 403e26a6f1 am: 7f3b246819 am: 52234bfe02

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

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