Merge "Properly protect mFrameMetricsReporter" into sc-dev am: 1e67f86165

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

Change-Id: Iace8e93306f5718b0b0959afeeb2298695624646