Merge "usb: Correct right USB Gadget HAL Version on resetUsbGadget" into udc-dev am: 8ab1601f

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



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