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

* commit '862540cdb11a7128ae1fd670136f398645b4af7b':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"