Merge "Changes to OWNERS files for USB." into main am: b9a3d1b10d am: 21616edcad

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

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