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

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

Change-Id: I46b4f17d0b3075d1cefbf0cb7fa775bf3259d746