Merge changes from topic "aidl-java-api-ci"

* changes:
  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;
+        }
     }
 }