Merge "gpuservice: prevent hang in destruction" into main am: 0dbe6326a7

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

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