Merge "Merge "BatteryStats: use the same timestamp for comparing intervals"...
Merge "Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev am: 6a4d9a3c am: cfc3be21" into nyc-mr1-dev-plus-aosp
am: 10ac2921
* commit '10ac2921':
Change-Id: I7681170518b119d824db4e42f7490005a51c79b5