Merge "BatteryStatsManager: Address API council feedback" into rvc-dev am: 03a65f1a am: f0d757ac am: eb05d361 am: b1502775 Change-Id: Ice553b93cceac6e4378c6555e8b733351b458533