Merge "Revert "Ensure reportFrameMetrics not being called on deleted instance"" into sc-dev am: 8810677c am: ea953ceb am: c9ca30fd

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

Change-Id: If216bb6813e7b36eea38ef84cb10a05a7bffd44f