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

Merge "Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a46 am: b6925c2f am: 39645c25" into sc-dev am: 7a2801ab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9f243be57a5fa1c6ccc7919d602b281b7247eaf