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