ANDROID: usb: dwc3: Fix gadget mis-merge from upstream

The change https://r.android.com/c/2578319 was merged before it landed
in the upstream 5.15 LTS kernel which resulted in merge conflicts when
5.15.128 was merged (https://r.android.com/2729653) that were not
properly resolved. Later when 5.15.149 was merged
(https://r.android.com/3044992

), which had the backported change, the
merge conflicts again were not properly resolved. As it stands today,
the upstream change: commit 39674be5 is
partially reverted. Fix this to bring back the proper functionality.

Bug: 364171072
Change-Id: I0957229f29ef6715dc3e88943e015e713a91ed71
Signed-off-by: Will McVicker <willmcvicker@google.com>