[automerger skipped] Merge changes from topic "power.stats HAL" am: df43c41b27 am: 9d21a5b185
am: 3bb32db38d -s ours
am skip reason: change_id Ib60ac0b37bd30663c5e7434546cdcfbf64915538 with SHA1 a630f84814 is in history

Change-Id: I2090e0ce571cb8f222b01ed3bfd667a74a848d3f