Merge "BatteryStatsManager: Address API council feedback" into rvc-dev