Merge "USB owners cleanup" am: 451350985a am: 2f37a8ad2c

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

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