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

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

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