Snap for 8558685 from e8df41e5e280628ca4ab504961d6eea9d643261f to tm-frc-os-statsd-release

Change-Id: Ide6384fc3d68fd66714dea0f92aafd57c0c2affc
diff --git a/vintfdata/frozen/6.xml b/vintfdata/frozen/6.xml
index 14ace95..eb078c0 100644
--- a/vintfdata/frozen/6.xml
+++ b/vintfdata/frozen/6.xml
@@ -1,5 +1,9 @@
 <compatibility-matrix version="5.0" type="device">
-    <hal format="hidl" optional="false">
+    <!--
+         cameraserver is installed for all phones and tablets, but not
+         auto or TV.
+    -->
+    <hal format="hidl" optional="true">
         <name>android.frameworks.cameraservice.service</name>
         <version>2.2</version>
         <interface>