Merge "[automerger skipped] Merge "Add OWNERS for USB functionality" into...

Merge "[automerger skipped] Merge "Add OWNERS for USB functionality" into tm-dev am: 8ebdc937 am: 9077533f -s ours am: 97328384 -s ours am: b6e3b3e7 -s ours am: cf5b2a7d -s ours" into udc-d1-dev-plus-aosp am: 5c36fa85 -s ours am: ecfc8440 -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



Change-Id: I9ad318e810d1b54709d80a356204596854f09313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>