Merge changes from topic "health-aidl" am: 713d22e0f1 am: f802438361 am: 54a25b2d7c am: 8f89dcc1be am: b78eba6435

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

Change-Id: I1f00338e3ee33d246e1d8c013cff628ec5053270
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 92f9263..4607f94 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -298,6 +298,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <!-- TODO(b/177269435): require health AIDL HAL and deprecate HIDL HAL -->
+    <hal format="aidl" optional="true">
+        <name>android.hardware.health</name>
+        <version>1</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.health.storage</name>
         <version>1</version>