Regenerate usb.conf .

MFC after:	1 week

git-svn-id: svn+ssh://svn.freebsd.org/base/head@275791 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
(cherry picked from commit b3bded60b065d1d945d6ee58cf69b9242fc24b95)

Conflicts:
	etc/devd/usb.conf

(cherry picked from commit 97cc9ac7301b60d312afb68f3c7af2bc4e58a3ac)

Ticket: #7153
Resolve USB driver identification conflict.

Reported by:	Anish Mistry <amistry@am-productions.biz>
MFC after:	1 week

git-svn-id: svn+ssh://svn.freebsd.org/base/head@275790 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
(cherry picked from commit 79f04ca5e5933258875f34b59ad8f1c976162026)
(cherry picked from commit db05aea7946123eb315d943321c5958ee0a42f43)

Ticket: #7153