am 1abead42: am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev

* commit '1abead425c0e862e316e17521833a33d22e7a850':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc