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

* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc