Merge "AHAL: fix USB HAL issues with reporting device capabilities." am: b3602ca0 am: abf4b3be

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



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