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

Change-Id: Ib487217caeb017f1a4e82a6eb45985193d0a1d13