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