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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3c448298eb529e797b5f1e292ddb6a4eace5317