Merge "Fix gpu resource not cleaned up" into main am: dab518a039 am: 8b07b22d9a am: ab6827934e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2849417

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