Merge "Fix potential memory leak of FrameTracker" into sc-dev am: aef0db8f am: 4a5ea0ec am: cc0f0db0

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

Change-Id: Ia9756606b7ee3fdb9dbf3fe1dd34810f665aed49