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

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

Change-Id: Ie28a6dea53120a832b9d20ef63ebaf44478fb12d