Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev