Merge "Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625 am: b6925c2fc7 am: 39645c256c" into sc-dev