Merge changes from topic "227137943" am: 2f48177cbe

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

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

services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java

@@ -462,5 +462,15 @@ public final class UsbPortAidl implements UsbPortHal {
                         + operationID + " failed. err:" + retval);
             }
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return IUsbCallback.HASH;
+        }
+
+        @Override
+        public int getInterfaceVersion() {
+            return IUsbCallback.VERSION;
+        }
     }
 }