Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev