Merge "Fix crash from asynchronous GPU metrics" into tm-qpr-dev am: fcc50ef1 am: 0c5f6f89

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



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