Merge changes from topic "aidl-java-api-ci" into tm-dev

* changes:
  Implement getInterfaceHash/Version (USB)
  Implement getInterfaceHash/Version (CHRE)
  Implement getInterfaceHash/Version (omapi)
  Implement getInterfaceHash/Version (health)

omapi/java/android/se/omapi/SEService.java

@@ -118,6 +118,16 @@ public final class SEService {
                 });
             }
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return ISecureElementListener.HASH;
+        }
+
+        @Override
+        public int getInterfaceVersion() {
+            return ISecureElementListener.VERSION;
+        }
     }
     private SEListener mSEListener = new SEListener();
 

services/core/java/com/android/server/health/HealthRegCallbackAidl.java

@@ -115,5 +115,13 @@ public class HealthRegCallbackAidl {
         public void healthInfoChanged(HealthInfo healthInfo) throws RemoteException {
             mServiceInfoCallback.update(healthInfo);
         }
+        @Override
+        public String getInterfaceHash() {
+            return IHealthInfoCallback.HASH;
+        }
+        @Override
+        public int getInterfaceVersion() {
+            return IHealthInfoCallback.VERSION;
+        }
     }
 }

services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java

@@ -389,6 +389,15 @@ public abstract class IContextHubWrapper {
                     mCallback.handleTransactionResult(transactionId, success);
                 });
             }
+            @Override
+            public String getInterfaceHash() {
+                return android.hardware.contexthub.IContextHubCallback.HASH;
+            }
+
+            @Override
+            public int getInterfaceVersion() {
+                return android.hardware.contexthub.IContextHubCallback.VERSION;
+            }
         }
 
         ContextHubWrapperAidl(android.hardware.contexthub.IContextHub hub) {

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

@@ -725,5 +725,15 @@ public final class UsbPortAidl implements UsbPortHal {
                         e);
             }
         }
+
+        @Override
+        public String getInterfaceHash() {
+            return IUsbCallback.HASH;
+        }
+
+        @Override
+        public int getInterfaceVersion() {
+            return IUsbCallback.VERSION;
+        }
     }
 }