[automerger skipped] CellularBatteryStats: Address API council feedback am:...
[automerger skipped] CellularBatteryStats: Address API council feedback am: d40db4e7 am: a35af3d3 am: aecae20f am: 3bac07b6 -s ours
am skip reason: Change-Id I9de6d1fe8d7746a1ebe61bdefb34cb4908cd5798 with SHA-1 6a655f3f is in history
Change-Id: Id07bf1adcead46f6df2f955a502c2ee3d929884f