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

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

Change-Id: Ie7bd3a96c8d1d32a24c5f6fc4d6461748545e5ef