Merge "USB owners cleanup" am: 451350985a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2372269

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