Merge "Correct metrics category in ConnectedDeviceSlice"