Merge "BatteryStatsManager: Address API council feedback" into rvc-dev am: 03a65f1a am: f0d757ac am: d1a413dd Change-Id: I042ffd4e0e97ab6c89eb9d6767e484494fb6c7ea