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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idca8b8f2b16cc6290f42e917dc337f096621ff29