[automerger skipped] CellularBatteryStats: Address API council feedback am:...
[automerger skipped] CellularBatteryStats: Address API council feedback am: d40db4e7 am: 25f5285f -s ours
am skip reason: Change-Id I9de6d1fe8d7746a1ebe61bdefb34cb4908cd5798 with SHA-1 d40db4e7 is in history
Change-Id: Id7786f4b34d9b5525cdce1cd3d136254c863a0ae