Snap for 11164065 from ac51743c23bc7ddeb01f890d6a3af0dd17ea4fb3 to mainline-cellbroadcast-release

Change-Id: I96c601a6ff06c134b24780c88ae24bd93165ba6c
diff --git a/data/etc/google/64bit/user/advancedFeatures.ini b/data/etc/google/64bit/user/advancedFeatures.ini
index d182daa..027ece5 100644
--- a/data/etc/google/64bit/user/advancedFeatures.ini
+++ b/data/etc/google/64bit/user/advancedFeatures.ini
@@ -4,6 +4,7 @@
 LogcatPipe = on
 GLAsyncSwap = on
 GLESDynamicVersion = on
+HWCMultiConfigs = on
 PlayStoreImage = on
 EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
diff --git a/data/etc/google/64bit/user/arm64/advancedFeatures.ini b/data/etc/google/64bit/user/arm64/advancedFeatures.ini
index 87fd5bb..97e3b58 100644
--- a/data/etc/google/64bit/user/arm64/advancedFeatures.ini
+++ b/data/etc/google/64bit/user/arm64/advancedFeatures.ini
@@ -4,6 +4,7 @@
 LogcatPipe = on
 GLAsyncSwap = on
 GLESDynamicVersion = on
+HWCMultiConfigs = on
 PlayStoreImage = on
 EncryptUserData = on
 VirtioWifi = on
diff --git a/tablet/data/etc/tablet.xml b/tablet/data/etc/tablet.xml
index 002af90..7e93c5c 100644
--- a/tablet/data/etc/tablet.xml
+++ b/tablet/data/etc/tablet.xml
@@ -17,4 +17,6 @@
 <permissions>
   <!-- Do not support autofocus in tablet devices. -->
   <unavailable-feature name="android.hardware.camera.autofocus" />
+  <!-- Do not support hinge angle sensors in tablet devices. -->
+  <unavailable-feature name="android.hardware.sensor.hinge_angle" />
 </permissions>