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

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

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