Revert "Change graphics common version to 6"

Revert submission 31743741-CF changes for Android Display Processing

Reason for revert: Testing if this resolves b/398170080

Reverted changes: /q/submissionid:31743741-CF+changes+for+Android+Display+Processing

Change-Id: I03e1ff4d2f38181db265fb88409433a1e2899427
diff --git a/compatibility_matrices/compatibility_matrix.202504.xml b/compatibility_matrices/compatibility_matrix.202504.xml
index 4e0cade..8d5a50a 100644
--- a/compatibility_matrices/compatibility_matrix.202504.xml
+++ b/compatibility_matrices/compatibility_matrix.202504.xml
@@ -709,14 +709,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>android.hardware.tv.mediaquality</name>
-        <version>1</version>
-        <interface>
-            <name>IPictureProfileChangedListener</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- The native mapper HAL must exist on the device -->
     <hal format="native">
         <name>mapper</name>
diff --git a/compatibility_matrices/compatibility_matrix.202604.xml b/compatibility_matrices/compatibility_matrix.202604.xml
index 11f77e2..e5e2abf 100644
--- a/compatibility_matrices/compatibility_matrix.202604.xml
+++ b/compatibility_matrices/compatibility_matrix.202604.xml
@@ -709,14 +709,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>android.hardware.tv.mediaquality</name>
-        <version>1</version>
-        <interface>
-            <name>IPictureProfileChangedListener</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <!-- The native mapper HAL must exist on the device -->
     <hal format="native">
         <name>mapper</name>
diff --git a/tv/mediaquality/aidl/Android.bp b/tv/mediaquality/aidl/Android.bp
index 0cef9c8..f817836 100644
--- a/tv/mediaquality/aidl/Android.bp
+++ b/tv/mediaquality/aidl/Android.bp
@@ -14,7 +14,7 @@
         "android/hardware/tv/mediaquality/*.aidl",
     ],
     imports: [
-        "android.hardware.graphics.common-V6",
+        "android.hardware.graphics.common-V5",
     ],
     stability: "vintf",
     backend: {
@@ -38,7 +38,7 @@
     versions_with_info: [
         {
             version: "1",
-            imports: ["android.hardware.graphics.common-V6"],
+            imports: ["android.hardware.graphics.common-V5"],
         },
     ],