Merge changes from topic "revert-1540633-DNRXHDZSUB" am: f504e514c4 am: 9727575946 am: 657097c29c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64bdaddf33e63f76ca1a23eb6e4c08a3cf22789e
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 2f67266..609d78d 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -553,7 +553,6 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.vibrator</name>
-        <version>1-2</version>
         <interface>
             <name>IVibrator</name>
             <instance>default</instance>
diff --git a/vibrator/aidl/default/vibrator-default.xml b/vibrator/aidl/default/vibrator-default.xml
index b5bd3dd..137a811 100644
--- a/vibrator/aidl/default/vibrator-default.xml
+++ b/vibrator/aidl/default/vibrator-default.xml
@@ -1,7 +1,6 @@
 <manifest version="1.0" type="device">
     <hal format="aidl">
         <name>android.hardware.vibrator</name>
-        <version>2</version>
         <fqname>IVibrator/default</fqname>
     </hal>
     <hal format="aidl">