Merge "Ensure reportFrameMetrics not being called on deleted instance" into sc-dev am: c71ee4b1 am: 88ee9d03

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

Change-Id: I7a54b110dd7479d356cbc37625ce8e7824636f2a