Merge "Revert "Ensure reportFrameMetrics not being called on deleted instance"" into sc-dev am: 8810677cf3 am: 97ab85cad8

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

Change-Id: I0d90db63d8a5ac7153c2d2be6a3a9371b5331f60