am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking...
am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
* commit '862540cd':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"