Merge "Fixed gpuservice_unittest mem leaks" am: 8de18018 am: 86a3e60c am:...

Merge "Fixed gpuservice_unittest mem leaks" am: 8de18018 am: 86a3e60c am: 403e26a6 am: 7f3b2468

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



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