Merge remote-tracking branch 'phh/android-8.1' into o8.1-los

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 67e227b..8df0635 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -28,4 +28,6 @@
 	<integer name="config_multiuserMaximumUsers">4</integer>
 	<bool name="config_enableMultiUserUI">true</bool>
 	-->
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
 </resources>
diff --git a/sepolicy/qualcomm.te b/sepolicy/qualcomm.te
index edde901..9baaa56 100644
--- a/sepolicy/qualcomm.te
+++ b/sepolicy/qualcomm.te
@@ -9,3 +9,8 @@
 #Pixel 2
 type vnd_qcrilhook_hwservice, hwservice_manager_type;
 allow system_app vnd_qcrilhook_hwservice:hwservice_manager { find };
+
+# cf https://github.com/phhusson/treble_experimentations/issues/131
+# SELinux : avc:  denied  { add } for interface=android.hardware.tetheroffload.control::IOffloadControl pid=15220 scontext=u:r:ipacm:s0 tcontext=u:object_r:hal_tetheroffload_hwservice:s0 tclass=hwservice_manager permissive=0
+type ipacm, hwservice_manager_type;
+allow ipacm hal_tetheroffload_hwservice:hwservice_manager { add };