diff --git a/configs/privapp-permissions-qti.xml b/configs/privapp-permissions-qti.xml
index 1f312aa7..6184a182 100644
--- a/configs/privapp-permissions-qti.xml
+++ b/configs/privapp-permissions-qti.xml
@@ -29,148 +29,164 @@ It allows additional grants on top of privapp-permissions-platform.xml
 
 <permissions>
     <privapp-permissions package="com.quicinc.cne.CNEService">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+      <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.qti.dpmserviceapp">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-	<privapp-permissions package="se.dirac.acs">
-		<permission name="android.permission.INTERACT_ACROSS_USERS"/>
-	</privapp-permissions>
-	<privapp-permissions package="android.ext.services">
-		<permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
-	</privapp-permissions>
-		<privapp-permissions package="android.ext.services">
-		<permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.CALL_PRIVILEGED"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.CHANGE_CONFIGURATION"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.MODIFY_PHONE_STATE"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.AutoTest">
-		<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-	</privapp-permissions>
-			<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
-	</privapp-permissions>
-	<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.CALL_PRIVILEGED"/>
-	</privapp-permissions>
-	<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.CHANGE_CONFIGURATION"/>
-	</privapp-permissions>
-	<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.MODIFY_PHONE_STATE"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.longcheertel.cit">
-		<permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-	</privapp-permissions>
-		<privapp-permissions package="com.android.systemui">
-		<permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-	</privapp-permissions>
-
-	<privapp-permissions package="com.caf.fmradio">
-		<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
 
-	<privapp-permissions package="com.caf.fmradio">
-		<permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    <privapp-permissions package="se.dirac.acs">
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="android.ext.services">
+      <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="android.ext.services">
+      <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.CALL_PRIVILEGED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.CHANGE_CONFIGURATION"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.MODIFY_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.AutoTest">
+      <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.CALL_PRIVILEGED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.CHANGE_CONFIGURATION"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.MODIFY_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.longcheertel.cit">
+      <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.systemui">
+      <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.caf.fmradio">
+      <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.caf.fmradio">
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+      <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.dialer">
-        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+      <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
+      <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+      <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+      <permission name="android.permission.MODIFY_PHONE_STATE"/>
+      <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+      <permission name="android.permission.STATUS_BAR"/>
+      <permission name="android.permission.STOP_APP_SWITCHES"/>
+      <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+      <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.qti.qtiNetworkApp">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+      <permission name="android.permission.MODIFY_PHONE_STATE"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+      <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.soundrecorder">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+      <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+      <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.quicinc.voice.activation">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
+      <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+      <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.qualcomm.qti.carrierswitch">
-        <permission name="android.permission.REBOOT"/>
+      <permission name="android.permission.REBOOT"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.qualcomm.wfd.service">
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+      <permission name="android.permission.READ_FRAME_BUFFER"/>
+      <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.mms">
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+      <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+      <permission name="android.permission.WRITE_APN_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.bluetooth.batestapp">
-        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+      <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+      <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.snapcam">
-        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+      <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+      <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.qualcomm.qti.callenhancement">
-        <permission name="android.permission.RECORD_AUDIO" />
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
-        <permission name="android.permission.READ_EXTERNAL_STORAGE" />
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        <permission name="android.permission.READ_BLOCKED_NUMBERS" />
-        <permission name="android.permission.VIBRATE" />
+      <permission name="android.permission.RECORD_AUDIO" />
+      <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
+      <permission name="android.permission.READ_EXTERNAL_STORAGE" />
+      <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
+      <permission name="android.permission.READ_BLOCKED_NUMBERS" />
+      <permission name="android.permission.VIBRATE" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.camera">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE" />
-        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
+      <permission name="android.permission.WRITE_MEDIA_STORAGE" />
+      <permission name="android.permission.WRITE_SECURE_SETTINGS" />
+      <permission name="android.permission.INTERACT_ACROSS_USERS" />
     </privapp-permissions>
 </permissions>