Merge "Fix potential memory leak of FrameTracker" into sc-dev am: aef0db8f94

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

Change-Id: I8fc1922802a844530d43dc9462fc8d801094f3e9