Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev am: 154cc8237b
am: 179fca0241

Change-Id: Id16110695937a71d1bfb3a6ea068273305e91f9c