Merge changes from topic "aidl_freeze_tm" into tm-dev am: 118b6a3c8a

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

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

services/core/java/com/android/server/soundtrigger_middleware/SoundTriggerHw3Compat.java

@@ -206,6 +206,16 @@ public class SoundTriggerHw3Compat implements ISoundTriggerHal {
         public void onResourcesAvailable() {
             mDelegate.onResourcesAvailable();
         }
+
+        @Override
+        public int getInterfaceVersion() {
+            return ISoundTriggerHwGlobalCallback.VERSION;
+        }
+
+        @Override
+        public String getInterfaceHash() {
+            return ISoundTriggerHwGlobalCallback.HASH;
+        }
     }
 
     private static class ModelCallbackAdaper extends ISoundTriggerHwCallback.Stub {
@@ -233,5 +243,15 @@ public class SoundTriggerHw3Compat implements ISoundTriggerHal {
             event.recognitionStillActive |= event.status == RecognitionStatus.FORCED;
             mDelegate.recognitionCallback(model, event);
         }
+
+        @Override
+        public int getInterfaceVersion() {
+            return ISoundTriggerHwCallback.VERSION;
+        }
+
+        @Override
+        public String getInterfaceHash() {
+            return ISoundTriggerHwCallback.HASH;
+        }
     }
 }