Merge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
am: ebbbead915

Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad