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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id00ebe6331ae65ba4c3ee2f549e89ba3a527bd2c