Merge "Revert "Ensure reportFrameMetrics not being called on deleted instance"" into sc-dev am: 8810677c am: 956d1a89 am: 7805ad0b

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

Change-Id: Iff2d31a27a0f2699f691c8371ecf6865954b6b69