Merge "Rate limit BatteryStats' ModemActivityInfo querying"