[automerger skipped] CellularBatteryStats: Address API council feedback am:...
[automerger skipped] CellularBatteryStats: Address API council feedback am: d40db4e7 am: a35af3d3 am: 06e2b1fb -s ours am: 7ed3ede3 -s ours
am skip reason: Change-Id I9de6d1fe8d7746a1ebe61bdefb34cb4908cd5798 with SHA-1 d40db4e7 is in history
Change-Id: I2cc359b6e6cbaa2c3bb8c13f7d8d0a577e89c6d8