Merge "Fix crash from asynchronous GPU metrics" into main am: a053654776

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

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