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