Add an exported flag in manifest

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I44fe1df6c11b94169403e57b82735a97c4033dc2
diff --git a/FrameworkPackageStubs/AndroidManifest.xml b/FrameworkPackageStubs/AndroidManifest.xml
index 912944c..68aa286 100644
--- a/FrameworkPackageStubs/AndroidManifest.xml
+++ b/FrameworkPackageStubs/AndroidManifest.xml
@@ -1,193 +1,204 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.car.frameworkpackagestubs"
-          android:versionCode="1"
-          android:versionName="1.0.1">
+     package="com.android.car.frameworkpackagestubs"
+     android:versionCode="1"
+     android:versionName="1.0.1">
 
     <uses-sdk android:minSdkVersion="28"/>
 
     <application android:label="@string/app_name"
-                 android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
+         android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
 
         <!-- Dialer stubs -->
         <activity android:name=".Stubs$DialerStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.DIAL" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.DIAL"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="voicemail"/>
             </intent-filter>
         </activity>
 
         <!-- Music / media stubs. -->
         <activity android:name=".Stubs$MediaStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="file"/>
                 <data android:mimeType="audio/*"/>
                 <data android:mimeType="application/ogg"/>
                 <data android:mimeType="application/x-ogg"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
                 <data android:scheme="http"/>
                 <data android:mimeType="audio/*"/>
                 <data android:mimeType="application/ogg"/>
                 <data android:mimeType="application/x-ogg"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
                 <data android:scheme="content"/>
                 <data android:mimeType="audio/*"/>
                 <data android:mimeType="application/ogg"/>
                 <data android:mimeType="application/x-ogg"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.PICK"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="vnd.android.cursor.dir/audio"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:mimeType="video/*" />
-                <data android:mimeType="image/*" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="content"/>
+                <data android:scheme="file"/>
+                <data android:mimeType="video/*"/>
+                <data android:mimeType="image/*"/>
             </intent-filter>
         </activity>
 
         <!-- Settings package stubs -->
         <activity android:name=".Stubs$SettingsStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
+                <action android:name="android.app.action.ADD_DEVICE_ADMIN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.ACCESSIBILITY_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.PROCESS_WIFI_EASY_CONNECT_URI" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.LOCATION_SCANNING_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter android:priority="-1">
+                <action android:name="android.settings.PROCESS_WIFI_EASY_CONNECT_URI"/>
+                <category android:name="android.intent.category.DEFAULT"/>
                 <data android:scheme="DPP"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.USER_DICTIONARY_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <!-- CDD Core Application Intents Stubs -->
         <!-- Desk Clock -->
         <activity android:name=".Stubs$DeskClockStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.SET_ALARM" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SET_ALARM"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.SET_TIMER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SET_TIMER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.SHOW_ALARMS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SHOW_ALARMS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.DISMISS_ALARM" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.DISMISS_ALARM"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.SHOW_TIMERS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SHOW_TIMERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.SNOOZE_ALARM" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SNOOZE_ALARM"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <!-- Calendar -->
         <activity android:name=".Stubs$CalendarStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/event" />
+                <action android:name="android.intent.action.EDIT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="vnd.android.cursor.item/event"/>
             </intent-filter>
         </activity>
 
         <!-- Browser -->
         <activity android:name=".Stubs$BrowserStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.WEB_SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.WEB_SEARCH"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <!-- Ignore Background Data Restriction Setting -->
         <activity android:name=".Stubs$IgnoreBackgroundDataRestrictionsSettingsStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="package" />
+                <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="package"/>
             </intent-filter>
         </activity>
 
         <!-- Ignore Battery Optimization Setting -->
         <activity android:name=".Stubs$IgnoreBatteryOptimizationSettingsStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <!-- Request Ignore Battery Optimization Setting -->
         <activity android:name=".Stubs$RequestIgnoreBatteryOptimizationsStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="package" />
+                <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="package"/>
             </intent-filter>
         </activity>
 
         <!-- WebView Setting -->
         <activity android:name=".Stubs$WebViewSettingsStub"
-                  android:label="@string/stub_name"
-                  android:excludeFromRecents="true">
+             android:label="@string/stub_name"
+             android:excludeFromRecents="true"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.WEBVIEW_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.WEBVIEW_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/car-maps-placeholder/AndroidManifest.xml b/car-maps-placeholder/AndroidManifest.xml
index 8c96130..52634dc 100644
--- a/car-maps-placeholder/AndroidManifest.xml
+++ b/car-maps-placeholder/AndroidManifest.xml
@@ -16,23 +16,23 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.car.mapsplaceholder">
-    <uses-sdk
-        android:minSdkVersion="23"
-        android:targetSdkVersion="23" />
+     package="com.android.car.mapsplaceholder">
+    <uses-sdk android:minSdkVersion="23"
+         android:targetSdkVersion="23"/>
 
     <application android:label="@string/app_name"
-        android:icon="@drawable/logo_my_maps" >
+         android:icon="@drawable/logo_my_maps">
 
         <activity android:name=".MapsPlaceholderActivity"
-            android:theme="@style/CarMapsTheme"
-            android:launchMode="singleTask"
-            android:label="@string/app_name"
-            android:resizeableActivity="true">
+             android:theme="@style/CarMapsTheme"
+             android:launchMode="singleTask"
+             android:label="@string/app_name"
+             android:resizeableActivity="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.APP_MAPS" />
+                <category android:name="android.intent.category.APP_MAPS"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/car-usb-handler/AndroidManifest.xml b/car-usb-handler/AndroidManifest.xml
index caa93bd..0f60005 100644
--- a/car-usb-handler/AndroidManifest.xml
+++ b/car-usb-handler/AndroidManifest.xml
@@ -13,32 +13,34 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="android.car.usb.handler">
-    <uses-sdk android:minSdkVersion="25" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USB" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"
-                 android:directBootAware="true">
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="android.car.usb.handler">
+    <uses-sdk android:minSdkVersion="25"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.MANAGE_USB"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <application android:label="@string/app_name"
+         android:icon="@drawable/ic_launcher"
+         android:directBootAware="true">
         <activity android:name=".UsbHostManagementActivity"
-                  android:theme="@android:style/Theme.DeviceDefault.Dialog"
-                  android:launchMode="standard">
-            <meta-data
-                android:name="distractionOptimized"
-                android:value="true" />
+             android:theme="@android:style/Theme.DeviceDefault.Dialog"
+             android:launchMode="standard">
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
         </activity>
         <service android:name=".BootUsbService"
-                 android:exported="false"
-                 android:singleUser="true">
+             android:exported="false"
+             android:singleUser="true">
         </service>
         <receiver android:name=".BootUsbScanner"
-                  android:directBootAware="true">
+             android:directBootAware="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
     </application>
diff --git a/service/AndroidManifest.xml b/service/AndroidManifest.xml
index f15978c..1fe8c0c 100644
--- a/service/AndroidManifest.xml
+++ b/service/AndroidManifest.xml
@@ -15,930 +15,839 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="com.android.car"
-        coreApp="true"
-        android:sharedUserId="android.uid.system">
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.android.car"
+     coreApp="true"
+     android:sharedUserId="android.uid.system">
 
-    <original-package android:name="com.android.car" />
+    <original-package android:name="com.android.car"/>
 
     <!-- Used for runtime permissions related to monitoring vehicle information. -->
-    <permission-group
-        android:name="android.car.permission-group.CAR_MONITORING"
-        android:icon="@drawable/perm_group_car"
-        android:description="@string/car_permission_desc"
-        android:label="@string/car_permission_label" />
+    <permission-group android:name="android.car.permission-group.CAR_MONITORING"
+         android:icon="@drawable/perm_group_car"
+         android:description="@string/car_permission_desc"
+         android:label="@string/car_permission_label"/>
 
     <!-- Allows an application to read the vehicle energy information.
          <p>Protection level: dangerous
     -->
-    <permission
-        android:name="android.car.permission.CAR_ENERGY"
-        android:permissionGroup="android.car.permission-group.CAR_MONITORING"
-        android:protectionLevel="dangerous"
-        android:label="@string/car_permission_label_energy"
-        android:description="@string/car_permission_desc_energy" />
+    <permission android:name="android.car.permission.CAR_ENERGY"
+         android:permissionGroup="android.car.permission-group.CAR_MONITORING"
+         android:protectionLevel="dangerous"
+         android:label="@string/car_permission_label_energy"
+         android:description="@string/car_permission_desc_energy"/>
 
     <!-- Allows an application to adjust the vehicle's range remaining information.
          <p>Protection level: signature|privileged
-     -->
-    <permission
-        android:name="android.car.permission.ADJUST_RANGE_REMAINING"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_adjust_range_remaining"
-        android:description="@string/car_permission_desc_adjust_range_remaining" />
+    -->
+    <permission android:name="android.car.permission.ADJUST_RANGE_REMAINING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_adjust_range_remaining"
+         android:description="@string/car_permission_desc_adjust_range_remaining"/>
 
     <!-- Allows an application to read the VIN information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_IDENTIFICATION"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_identification"
-        android:description="@string/car_permission_desc_car_identification" />
+    <permission android:name="android.car.permission.CAR_IDENTIFICATION"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_identification"
+         android:description="@string/car_permission_desc_car_identification"/>
 
     <!-- Allows an application to control the vehicle HVAC.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_CLIMATE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_hvac"
-        android:description="@string/car_permission_desc_hvac" />
+    <permission android:name="android.car.permission.CONTROL_CAR_CLIMATE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_hvac"
+         android:description="@string/car_permission_desc_hvac"/>
 
     <!-- Allows an application to control the vehicle doors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_DOORS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_doors"
-        android:description="@string/car_permission_desc_control_car_doors" />
+    <permission android:name="android.car.permission.CONTROL_CAR_DOORS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_doors"
+         android:description="@string/car_permission_desc_control_car_doors"/>
 
     <!-- Allows an application to control the vehicle windows.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_WINDOWS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_windows"
-        android:description="@string/car_permission_desc_control_car_windows" />
+    <permission android:name="android.car.permission.CONTROL_CAR_WINDOWS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_windows"
+         android:description="@string/car_permission_desc_control_car_windows"/>
 
     <!-- Allows an application to control the vehicle mirrors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_MIRRORS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_mirrors"
-        android:description="@string/car_permission_desc_control_car_mirrors" />
+    <permission android:name="android.car.permission.CONTROL_CAR_MIRRORS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_mirrors"
+         android:description="@string/car_permission_desc_control_car_mirrors"/>
 
     <!-- Allows an application to control the vehicle seats.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_SEATS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_seats"
-        android:description="@string/car_permission_desc_control_car_seats" />
+    <permission android:name="android.car.permission.CONTROL_CAR_SEATS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_seats"
+         android:description="@string/car_permission_desc_control_car_seats"/>
 
     <!-- Allows an application to read the vehicle mileage information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_MILEAGE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_mileage"
-        android:description="@string/car_permission_desc_mileage" />
+    <permission android:name="android.car.permission.CAR_MILEAGE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_mileage"
+         android:description="@string/car_permission_desc_mileage"/>
 
     <!-- Allows an application to read the vehicle tire pressure information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_TIRES"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_tires"
-        android:description="@string/car_permission_desc_car_tires" />
+    <permission android:name="android.car.permission.CAR_TIRES"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_tires"
+         android:description="@string/car_permission_desc_car_tires"/>
 
     <!-- Allows an application to read the vehicle steering angle information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.READ_CAR_STEERING"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_steering"
-        android:description="@string/car_permission_desc_car_steering" />
+    <permission android:name="android.car.permission.READ_CAR_STEERING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_steering"
+         android:description="@string/car_permission_desc_car_steering"/>
 
     <!-- Allows an application to read the display units for distance, fuel, tire pressure,
          EV battery and fuel consumption.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.READ_CAR_DISPLAY_UNITS"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_read_car_display_units"
-        android:description="@string/car_permission_desc_read_car_display_units" />
+    <permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_read_car_display_units"
+         android:description="@string/car_permission_desc_read_car_display_units"/>
 
     <!-- Allows an application to control the display units for distance, fuel, tire pressure,
          EV battery and fuel consumption.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_DISPLAY_UNITS"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_control_car_display_units"
-        android:description="@string/car_permission_desc_control_car_display_units" />
+    <permission android:name="android.car.permission.CONTROL_CAR_DISPLAY_UNITS"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_control_car_display_units"
+         android:description="@string/car_permission_desc_control_car_display_units"/>
 
     <!-- Allows an application to read the vehicle speed.
          <p>Protection level: dangerous
     -->
-    <permission
-        android:name="android.car.permission.CAR_SPEED"
-        android:permissionGroup="android.permission-group.LOCATION"
-        android:protectionLevel="dangerous"
-        android:label="@string/car_permission_label_speed"
-        android:description="@string/car_permission_desc_speed" />
+    <permission android:name="android.car.permission.CAR_SPEED"
+         android:permissionGroup="android.permission-group.LOCATION"
+         android:protectionLevel="dangerous"
+         android:label="@string/car_permission_label_speed"
+         android:description="@string/car_permission_desc_speed"/>
 
     <!-- Allows an application to read the vehicle fuel and charge port status.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.CAR_ENERGY_PORTS"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_car_energy_ports"
-        android:description="@string/car_permission_desc_car_energy_ports" />
+    <permission android:name="android.car.permission.CAR_ENERGY_PORTS"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_car_energy_ports"
+         android:description="@string/car_permission_desc_car_energy_ports"/>
 
     <!-- Allows an application to control the vehicle fuel and charge port status.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_ENERGY_PORTS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_energy_ports"
-        android:description="@string/car_permission_desc_control_car_energy_ports" />
+    <permission android:name="android.car.permission.CONTROL_CAR_ENERGY_PORTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_energy_ports"
+         android:description="@string/car_permission_desc_control_car_energy_ports"/>
 
     <!-- Allows an application to read the vehicle engine information. For example, it allows an
          application to read the engine oil level, oil temperature, coolant temperature and RPM.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_ENGINE_DETAILED"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_engine_detailed"
-        android:description="@string/car_permission_desc_car_engine_detailed" />
+    <permission android:name="android.car.permission.CAR_ENGINE_DETAILED"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_engine_detailed"
+         android:description="@string/car_permission_desc_car_engine_detailed"/>
 
     <!-- Allows an application to read the vehicle dynamic state information. For example, it
          allows an application to read the ABS and traction control status.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_DYNAMICS_STATE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_vehicle_dynamics_state"
-        android:description="@string/car_permission_desc_vehicle_dynamics_state" />
+    <permission android:name="android.car.permission.CAR_DYNAMICS_STATE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vehicle_dynamics_state"
+         android:description="@string/car_permission_desc_vehicle_dynamics_state"/>
 
     <!-- Allows an application to access the vehicle vendor channel to exchange vendor-specific information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_VENDOR_EXTENSION"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_vendor_extension"
-        android:description="@string/car_permission_desc_vendor_extension" />
+    <permission android:name="android.car.permission.CAR_VENDOR_EXTENSION"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vendor_extension"
+         android:description="@string/car_permission_desc_vendor_extension"/>
 
     <!-- Allows an application to project an interface from a phone to the vehicle display.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_PROJECTION"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_projection"
-        android:description="@string/car_permission_desc_projection" />
+    <permission android:name="android.car.permission.CAR_PROJECTION"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_projection"
+         android:description="@string/car_permission_desc_projection"/>
 
     <!-- Allows an application to get the status of other applications projecting to the vehicle display.
          technologies status changes.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_access_projection_status"
-        android:description="@string/car_permission_desc_access_projection_status" />
+    <permission android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_access_projection_status"
+         android:description="@string/car_permission_desc_access_projection_status"/>
 
     <!-- Must be required by projection service to ensure only system can bind to it.
          <p>Protection level: signature
     -->
-    <permission
-        android:name="android.car.permission.BIND_PROJECTION_SERVICE"
-        android:protectionLevel="signature"
-        android:label="@string/car_permission_label_bind_projection_service"
-        android:description="@string/car_permission_desc_bind_projection_service" />
+    <permission android:name="android.car.permission.BIND_PROJECTION_SERVICE"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_projection_service"
+         android:description="@string/car_permission_desc_bind_projection_service"/>
 
     <!-- Allows an application to emulate the vehicle HAL for testing purposes.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_MOCK_VEHICLE_HAL"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_mock_vehicle_hal"
-        android:description="@string/car_permission_desc_mock_vehicle_hal" />
+    <permission android:name="android.car.permission.CAR_MOCK_VEHICLE_HAL"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_mock_vehicle_hal"
+         android:description="@string/car_permission_desc_mock_vehicle_hal"/>
 
     <!-- Allows an application to read the vehicle car basic information. For example, it allows
          an application to read the vehicle Make, Model, Model Year, fuel capacity, fuel type,
          EV battery capacity, EV connection type, fuel door location and driver seat location.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.CAR_INFO"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_car_info"
-        android:description="@string/car_permission_desc_car_info" />
+    <permission android:name="android.car.permission.CAR_INFO"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_car_info"
+         android:description="@string/car_permission_desc_car_info"/>
 
     <!-- Allows an application to read information of car's vendor permission.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.READ_CAR_VENDOR_PERMISSION_INFO"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_vendor_permission_info"
-        android:description="@string/car_permission_desc_vendor_permission_info" />
+    <permission android:name="android.car.permission.READ_CAR_VENDOR_PERMISSION_INFO"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vendor_permission_info"
+         android:description="@string/car_permission_desc_vendor_permission_info"/>
 
     <!-- Allows an application to read the vehicle exterior environment information. For example,
          it allows an application to read the vehicle exterior temperature and night mode status.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.CAR_EXTERIOR_ENVIRONMENT"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_car_exterior_environment"
-        android:description="@string/car_permission_desc_car_exterior_environment" />
+    <permission android:name="android.car.permission.CAR_EXTERIOR_ENVIRONMENT"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_car_exterior_environment"
+         android:description="@string/car_permission_desc_car_exterior_environment"/>
 
     <!-- Allows an application to read the vehicle exterior lights state.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_EXTERIOR_LIGHTS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_exterior_lights"
-        android:description="@string/car_permission_desc_car_exterior_lights" />
+    <permission android:name="android.car.permission.CAR_EXTERIOR_LIGHTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_exterior_lights"
+         android:description="@string/car_permission_desc_car_exterior_lights"/>
 
     <!-- Allows an application to control the vehicle exterior lights.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_EXTERIOR_LIGHTS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_exterior_lights"
-        android:description="@string/car_permission_desc_control_car_exterior_lights" />
+    <permission android:name="android.car.permission.CONTROL_CAR_EXTERIOR_LIGHTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_exterior_lights"
+         android:description="@string/car_permission_desc_control_car_exterior_lights"/>
 
     <!-- Allows an application to read the vehicle interior lights state.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.READ_CAR_INTERIOR_LIGHTS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_interior_lights"
-        android:description="@string/car_permission_desc_car_interior_lights" />
+    <permission android:name="android.car.permission.READ_CAR_INTERIOR_LIGHTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_interior_lights"
+         android:description="@string/car_permission_desc_car_interior_lights"/>
 
     <!-- Allows an application to control the vehicle interior lights state.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_INTERIOR_LIGHTS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_interior_lights"
-        android:description="@string/car_permission_desc_control_car_interior_lights" />
+    <permission android:name="android.car.permission.CONTROL_CAR_INTERIOR_LIGHTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_interior_lights"
+         android:description="@string/car_permission_desc_control_car_interior_lights"/>
 
     <!-- Allows an application to control the vehicle power state.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_POWER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_power"
-        android:description="@string/car_permission_desc_car_power" />
+    <permission android:name="android.car.permission.CAR_POWER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_power"
+         android:description="@string/car_permission_desc_car_power"/>
 
     <!-- Allows an application to read the vehicle powertrain information. For example, it allows
          an application to read the vehicle current gear, ignition state or parking break status.
          <p>Protection level: normal
     -->
-    <permission
-        android:name="android.car.permission.CAR_POWERTRAIN"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_car_powertrain"
-        android:description="@string/car_permission_desc_car_powertrain" />
+    <permission android:name="android.car.permission.CAR_POWERTRAIN"
+         android:protectionLevel="normal"
+         android:label="@string/car_permission_label_car_powertrain"
+         android:description="@string/car_permission_desc_car_powertrain"/>
 
     <!-- Allows an application to access {@link android.car.navigation.CarNavigationStatusManager}
          to report navigation data. This information may be displayed by the vehicle in the
          instrument cluster, head-up display or other locations.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_NAVIGATION_MANAGER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_car_navigation_manager"
-        android:description="@string/car_permission_desc_car_navigation_manager" />
+    <permission android:name="android.car.permission.CAR_NAVIGATION_MANAGER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_car_navigation_manager"
+         android:description="@string/car_permission_desc_car_navigation_manager"/>
 
     <!-- Allows an application to read vehicle diagnostic information, including vendor-specific
          information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_DIAGNOSTICS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_diag_read"
-        android:description="@string/car_permission_desc_diag_read" />
+    <permission android:name="android.car.permission.CAR_DIAGNOSTICS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_diag_read"
+         android:description="@string/car_permission_desc_diag_read"/>
 
     <!-- Allows an application to clear diagnostic information from the vehicle.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_diag_clear"
-        android:description="@string/car_permission_desc_diag_clear" />
+    <permission android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_diag_clear"
+         android:description="@string/car_permission_desc_diag_clear"/>
 
     <!-- Must be required by VMS client service to ensure only system can bind to it.
          <p>Protection level: signature
     -->
-    <permission
-        android:name="android.car.permission.BIND_VMS_CLIENT"
-        android:protectionLevel="signature"
-        android:label="@string/car_permission_label_bind_vms_client"
-        android:description="@string/car_permission_desc_bind_vms_client" />
+    <permission android:name="android.car.permission.BIND_VMS_CLIENT"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_vms_client"
+         android:description="@string/car_permission_desc_bind_vms_client"/>
 
     <!-- Allows an application to publich VMS messages.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.VMS_PUBLISHER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_vms_publisher"
-        android:description="@string/car_permission_desc_vms_publisher" />
+    <permission android:name="android.car.permission.VMS_PUBLISHER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vms_publisher"
+         android:description="@string/car_permission_desc_vms_publisher"/>
 
     <!-- Allows an application to subscribe to VMS messages.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.VMS_SUBSCRIBER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_vms_subscriber"
-        android:description="@string/car_permission_desc_vms_subscriber" />
+    <permission android:name="android.car.permission.VMS_SUBSCRIBER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vms_subscriber"
+         android:description="@string/car_permission_desc_vms_subscriber"/>
 
     <!-- Allows an application to read the vehicle driving state.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_DRIVING_STATE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_driving_state"
-        android:description="@string/car_permission_desc_driving_state" />
+    <permission android:name="android.car.permission.CAR_DRIVING_STATE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_driving_state"
+         android:description="@string/car_permission_desc_driving_state"/>
 
     <!--  may replace this with system permission if proper one is defined. -->
-    <eat-comment />
+    <eat-comment/>
     <!-- Allows an application to block other applications for driver distraction purposes.
          Note: This permission may be replaced in future versions.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_APP_BLOCKING"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_app_blocking"
-        android:description="@string/car_permission_desc_control_app_blocking" />
+    <permission android:name="android.car.permission.CONTROL_APP_BLOCKING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_app_blocking"
+         android:description="@string/car_permission_desc_control_app_blocking"/>
 
     <!-- Allows an application to control the vehicle audio volume.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_audio_volume"
-        android:description="@string/car_permission_desc_audio_volume" />
+    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_audio_volume"
+         android:description="@string/car_permission_desc_audio_volume"/>
 
     <!-- Allows an application to control the vehicle audio settings.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_audio_settings"
-        android:description="@string/car_permission_desc_audio_settings" />
+    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_audio_settings"
+         android:description="@string/car_permission_desc_audio_settings"/>
 
     <!-- Must be required by instrument cluster service to ensure only system can bind to it.
          <p>Protection level: signature
     -->
-    <permission
-        android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
-        android:protectionLevel="system|signature"
-        android:label="@string/car_permission_label_receive_ducking"
-        android:description="@string/car_permission_desc_receive_ducking" />
+    <permission android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
+         android:protectionLevel="system|signature"
+         android:label="@string/car_permission_label_receive_ducking"
+         android:description="@string/car_permission_desc_receive_ducking"/>
 
-    <permission
-        android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
-        android:protectionLevel="signature"
-        android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
-        android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
+    <permission android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
+         android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
 
     <!-- Allows an application to handle the vehicle input events.
          <p>Protection level: signature
     -->
-    <permission
-        android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
-        android:protectionLevel="signature"
-        android:label="@string/car_permission_label_bind_input_service"
-        android:description="@string/car_permission_desc_bind_input_service"/>
+    <permission android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_input_service"
+         android:description="@string/car_permission_desc_bind_input_service"/>
 
     <!-- Allows an application to declare activities to be displayed in the instrument cluster.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_car_display_in_cluster"
-        android:description="@string/car_permission_desc_car_display_in_cluster" />
+    <permission android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_car_display_in_cluster"
+         android:description="@string/car_permission_desc_car_display_in_cluster"/>
 
     <!-- Allows an application to lunch applications in the instrument cluster.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_car_cluster_control"
-        android:description="@string/car_permission_desc_car_cluster_control" />
+    <permission android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_car_cluster_control"
+         android:description="@string/car_permission_desc_car_cluster_control"/>
 
     <!-- Allows an application to communicate with a device in AOAP mode.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_handle_usb_aoap_device"
-        android:description="@string/car_permission_desc_car_handle_usb_aoap_device" />
+    <permission android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_handle_usb_aoap_device"
+         android:description="@string/car_permission_desc_car_handle_usb_aoap_device"/>
 
     <!-- Allows an application to configure UX restrictions in the device.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_ux_restrictions_configuration"
-        android:description="@string/car_permission_desc_car_ux_restrictions_configuration" />
+    <permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_ux_restrictions_configuration"
+         android:description="@string/car_permission_desc_car_ux_restrictions_configuration"/>
 
     <!-- Allows an application to read state data from the 'Occupant Awareness System'.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.READ_CAR_OCCUPANT_AWARENESS_STATE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_read_car_occupant_awareness_state"
-        android:description="@string/car_permission_desc_read_car_occupant_awareness_state" />
+    <permission android:name="android.car.permission.READ_CAR_OCCUPANT_AWARENESS_STATE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_read_car_occupant_awareness_state"
+         android:description="@string/car_permission_desc_read_car_occupant_awareness_state"/>
 
     <!-- Allows an application to control the detection graph for the 'Occupant Awareness System'.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_OCCUPANT_AWARENESS_SYSTEM"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_occupant_awareness_system"
-        android:description="@string/car_permission_desc_control_car_occupant_awareness_system" />
+    <permission android:name="android.car.permission.CONTROL_CAR_OCCUPANT_AWARENESS_SYSTEM"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_occupant_awareness_system"
+         android:description="@string/car_permission_desc_control_car_occupant_awareness_system"/>
 
     <!-- Allows an application to monitor flash storage usage.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.STORAGE_MONITORING"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_storage_monitoring"
-        android:description="@string/car_permission_desc_storage_monitoring" />
+    <permission android:name="android.car.permission.STORAGE_MONITORING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_storage_monitoring"
+         android:description="@string/car_permission_desc_storage_monitoring"/>
 
     <!-- Allows an application to enroll trusted devices.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_ENROLL_TRUST"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_enroll_trust"
-        android:description="@string/car_permission_desc_enroll_trust" />
+    <permission android:name="android.car.permission.CAR_ENROLL_TRUST"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_enroll_trust"
+         android:description="@string/car_permission_desc_enroll_trust"/>
 
     <!-- Allows a test application to control car service's testing mode.
          This is only for platform level testing.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CAR_TEST_SERVICE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_test_service"
-        android:description="@string/car_permission_desc_car_test_service" />
+    <permission android:name="android.car.permission.CAR_TEST_SERVICE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_test_service"
+         android:description="@string/car_permission_desc_car_test_service"/>
 
     <!-- Allows system app to enable / disable / query features in the system.
      <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.CONTROL_CAR_FEATURES"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_features"
-        android:description="@string/car_permission_desc_control_car_features" />
+    <permission android:name="android.car.permission.CONTROL_CAR_FEATURES"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_features"
+         android:description="@string/car_permission_desc_control_car_features"/>
 
     <!-- Allows an application to use car watchdog service.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.USE_CAR_WATCHDOG"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_use_car_watchdog"
-        android:description="@string/car_permission_desc_use_car_watchdog" />
+    <permission android:name="android.car.permission.USE_CAR_WATCHDOG"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_use_car_watchdog"
+         android:description="@string/car_permission_desc_use_car_watchdog"/>
 
     <!-- Allows an application to read vendor properties related with windows.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_WINDOW"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_window"
-        android:description="@string/car_permission_desc_get_car_vendor_category_window" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_WINDOW"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_window"
+         android:description="@string/car_permission_desc_get_car_vendor_category_window"/>
 
     <!-- Allows an application to control vendor properties related with windows.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_WINDOW"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_window"
-        android:description="@string/car_permission_desc_set_car_vendor_category_window" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_WINDOW"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_window"
+         android:description="@string/car_permission_desc_set_car_vendor_category_window"/>
 
     <!-- Allows an application to read vendor properties related with doors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_DOOR"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_door"
-        android:description="@string/car_permission_desc_get_car_vendor_category_door" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_DOOR"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_door"
+         android:description="@string/car_permission_desc_get_car_vendor_category_door"/>
 
     <!-- Allows an application to control vendor properties related with doors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_DOOR"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_door"
-        android:description="@string/car_permission_desc_set_car_vendor_category_door" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_DOOR"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_door"
+         android:description="@string/car_permission_desc_set_car_vendor_category_door"/>
 
 
     <!-- Allows an application to read vendor properties related with seats.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_SEAT"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_seat"
-        android:description="@string/car_permission_desc_get_car_vendor_category_seat" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_SEAT"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_seat"
+         android:description="@string/car_permission_desc_get_car_vendor_category_seat"/>
 
     <!-- Allows an application to control vendor properties related with seats.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_SEAT"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_seat"
-        android:description="@string/car_permission_desc_set_car_vendor_category_seat" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_SEAT"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_seat"
+         android:description="@string/car_permission_desc_set_car_vendor_category_seat"/>
 
     <!-- Allows an application to read vendor properties related with mirrors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_MIRROR"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_mirror"
-        android:description="@string/car_permission_desc_get_car_vendor_category_mirror" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_MIRROR"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_mirror"
+         android:description="@string/car_permission_desc_get_car_vendor_category_mirror"/>
 
     <!-- Allows an application to control vendor properties related with mirrors.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_MIRROR"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_mirror"
-        android:description="@string/car_permission_desc_set_car_vendor_category_mirror" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_MIRROR"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_mirror"
+         android:description="@string/car_permission_desc_set_car_vendor_category_mirror"/>
 
     <!-- Allows an application to read vendor properties related with car information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_INFO"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_info"
-        android:description="@string/car_permission_desc_get_car_vendor_category_info" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_INFO"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_info"
+         android:description="@string/car_permission_desc_get_car_vendor_category_info"/>
 
     <!-- Allows an application to control vendor properties related with car information.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_INFO"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_info"
-        android:description="@string/car_permission_desc_set_car_vendor_category_info" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_INFO"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_info"
+         android:description="@string/car_permission_desc_set_car_vendor_category_info"/>
 
     <!-- Allows an application to read vendor properties related with engine.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_ENGINE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_engine"
-        android:description="@string/car_permission_desc_get_car_vendor_category_engine" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_ENGINE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_engine"
+         android:description="@string/car_permission_desc_get_car_vendor_category_engine"/>
 
     <!-- Allows an application to control vendor properties related with engine.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_ENGINE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_engine"
-        android:description="@string/car_permission_desc_set_car_vendor_category_engine" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_ENGINE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_engine"
+         android:description="@string/car_permission_desc_set_car_vendor_category_engine"/>
 
     <!-- Allows an application to read vendor properties related with HVAC.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_HVAC"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_hvac"
-        android:description="@string/car_permission_desc_get_car_vendor_category_hvac" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_HVAC"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_hvac"
+         android:description="@string/car_permission_desc_get_car_vendor_category_hvac"/>
 
     <!-- Allows an application to control vendor properties related with hvac.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_HVAC"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_hvac"
-        android:description="@string/car_permission_desc_set_car_vendor_category_hvac" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_HVAC"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_hvac"
+         android:description="@string/car_permission_desc_set_car_vendor_category_hvac"/>
 
     <!-- Allows an application to read vendor properties related with light.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_LIGHT"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_light"
-        android:description="@string/car_permission_desc_get_car_vendor_category_light" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_LIGHT"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_light"
+         android:description="@string/car_permission_desc_get_car_vendor_category_light"/>
 
     <!-- Allows an application to control vendor properties related with light.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_LIGHT"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_light"
-        android:description="@string/car_permission_desc_set_car_vendor_category_light" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_LIGHT"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_light"
+         android:description="@string/car_permission_desc_set_car_vendor_category_light"/>
 
     <!-- Allows an application to access vendor properties in category 1.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_1"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_1"
-        android:description="@string/car_permission_desc_get_car_vendor_category_1" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_1"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_1"
+         android:description="@string/car_permission_desc_get_car_vendor_category_1"/>
 
     <!-- Allows an application to control vendor properties in category 1.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_1"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_1"
-        android:description="@string/car_permission_desc_set_car_vendor_category_1" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_1"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_1"
+         android:description="@string/car_permission_desc_set_car_vendor_category_1"/>
 
     <!-- Allows an application to access vendor properties in category 2.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_2"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_2"
-        android:description="@string/car_permission_desc_get_car_vendor_category_2" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_2"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_2"
+         android:description="@string/car_permission_desc_get_car_vendor_category_2"/>
 
     <!-- Allows an application to control vendor properties in category 2.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_2"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_2"
-        android:description="@string/car_permission_desc_set_car_vendor_category_2" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_2"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_2"
+         android:description="@string/car_permission_desc_set_car_vendor_category_2"/>
 
     <!-- Allows an application to access vendor properties in category 3.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_3"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_3"
-        android:description="@string/car_permission_desc_get_car_vendor_category_3" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_3"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_3"
+         android:description="@string/car_permission_desc_get_car_vendor_category_3"/>
 
     <!-- Allows an application to control vendor properties in category 3.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_3"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_3"
-        android:description="@string/car_permission_desc_set_car_vendor_category_3" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_3"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_3"
+         android:description="@string/car_permission_desc_set_car_vendor_category_3"/>
 
     <!-- Allows an application to access vendor properties in category 4.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_4"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_4"
-        android:description="@string/car_permission_desc_get_car_vendor_category_4" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_4"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_4"
+         android:description="@string/car_permission_desc_get_car_vendor_category_4"/>
 
     <!-- Allows an application to control vendor properties in category 4.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_4"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_4"
-        android:description="@string/car_permission_desc_set_car_vendor_category_4" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_4"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_4"
+         android:description="@string/car_permission_desc_set_car_vendor_category_4"/>
 
     <!-- Allows an application to access vendor properties in category 5.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_5"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_5"
-        android:description="@string/car_permission_desc_get_car_vendor_category_5" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_5"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_5"
+         android:description="@string/car_permission_desc_get_car_vendor_category_5"/>
 
     <!-- Allows an application to control vendor properties in category 5.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_5"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_5"
-        android:description="@string/car_permission_desc_set_car_vendor_category_5" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_5"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_5"
+         android:description="@string/car_permission_desc_set_car_vendor_category_5"/>
 
     <!-- Allows an application to access vendor properties in category 6.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_6"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_6"
-        android:description="@string/car_permission_desc_get_car_vendor_category_6" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_6"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_6"
+         android:description="@string/car_permission_desc_get_car_vendor_category_6"/>
 
     <!-- Allows an application to control vendor properties in category 6.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_6"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_6"
-        android:description="@string/car_permission_desc_set_car_vendor_category_6" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_6"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_6"
+         android:description="@string/car_permission_desc_set_car_vendor_category_6"/>
 
     <!-- Allows an application to access vendor properties in category 7.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_7"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_7"
-        android:description="@string/car_permission_desc_get_car_vendor_category_7" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_7"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_7"
+         android:description="@string/car_permission_desc_get_car_vendor_category_7"/>
 
     <!-- Allows an application to control vendor properties in category 7.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_7"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_7"
-        android:description="@string/car_permission_desc_set_car_vendor_category_7" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_7"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_7"
+         android:description="@string/car_permission_desc_set_car_vendor_category_7"/>
 
     <!-- Allows an application to access vendor properties in category 8.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_8"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_8"
-        android:description="@string/car_permission_desc_get_car_vendor_category_8" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_8"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_8"
+         android:description="@string/car_permission_desc_get_car_vendor_category_8"/>
 
     <!-- Allows an application to control vendor properties in category 8.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_8"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_8"
-        android:description="@string/car_permission_desc_set_car_vendor_category_8" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_8"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_8"
+         android:description="@string/car_permission_desc_set_car_vendor_category_8"/>
 
     <!-- Allows an application to access vendor properties in category 9.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_9"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_9"
-        android:description="@string/car_permission_desc_get_car_vendor_category_9" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_9"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_9"
+         android:description="@string/car_permission_desc_get_car_vendor_category_9"/>
 
     <!-- Allows an application to control vendor properties in category 9.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_9"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_9"
-        android:description="@string/car_permission_desc_set_car_vendor_category_9" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_9"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_9"
+         android:description="@string/car_permission_desc_set_car_vendor_category_9"/>
 
     <!-- Allows an application to access vendor properties in category 10.
          <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_10"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_get_car_vendor_category_10"
-        android:description="@string/car_permission_desc_get_car_vendor_category_10" />
+    <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_10"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_get_car_vendor_category_10"
+         android:description="@string/car_permission_desc_get_car_vendor_category_10"/>
 
     <!-- Allows an application to control vendor properties in category 10.
         <p>Protection level: signature|privileged
     -->
-    <permission
-        android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_10"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_set_car_vendor_category_10"
-        android:description="@string/car_permission_desc_set_car_vendor_category_10" />
+    <permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_10"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_set_car_vendor_category_10"
+         android:description="@string/car_permission_desc_set_car_vendor_category_10"/>
 
 
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING" />
-    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.REAL_GET_TASKS" />
-    <uses-permission android:name="android.permission.REBOOT" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REMOVE_TASKS" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.LOCATION_HARDWARE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" />
-    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING"/>
+    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
+    <uses-permission android:name="android.permission.REBOOT"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.REMOVE_TASKS"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
 
     <application android:label="@string/app_title"
-                 android:directBootAware="true"
-                 android:allowBackup="false"
-                 android:persistent="true">
+         android:directBootAware="true"
+         android:allowBackup="false"
+         android:persistent="true">
 
         <service android:name=".CarService"
-                android:singleUser="true">
+             android:singleUser="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.car.ICar" />
+                <action android:name="android.car.ICar"/>
             </intent-filter>
         </service>
-        <service android:name=".PerUserCarService" android:exported="false" />
+        <service android:name=".PerUserCarService"
+             android:exported="false"/>
 
-        <service
-            android:name="com.android.car.trust.CarBleTrustAgent"
-            android:permission="android.permission.BIND_TRUST_AGENT"
-            android:singleUser="true">
+        <service android:name="com.android.car.trust.CarBleTrustAgent"
+             android:permission="android.permission.BIND_TRUST_AGENT"
+             android:singleUser="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.service.trust.TrustAgentService" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.service.trust.TrustAgentService"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <!-- Warning: the meta data must be included if the service is direct boot aware.
-                If not included, the device will crash before boot completes. Rendering the
-                device unusable. -->
+                 If not included, the device will crash before boot completes. Rendering the
+                 device unusable. -->
             <meta-data android:name="android.service.trust.trustagent"
-                       android:resource="@xml/car_trust_agent"/>
+                 android:resource="@xml/car_trust_agent"/>
         </service>
         <activity android:name="com.android.car.pm.ActivityBlockingActivity"
-                  android:documentLaunchMode="always"
-                  android:excludeFromRecents="true"
-                  android:exported="false"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar">
+             android:documentLaunchMode="always"
+             android:excludeFromRecents="true"
+             android:exported="false"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <activity android:name="com.android.car.am.ContinuousBlankActivity"
-                  android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:exported="false"
-                  android:launchMode="singleTask">
+             android:excludeFromRecents="true"
+             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+             android:exported="false"
+             android:launchMode="singleTask">
         </activity>
     </application>
 </manifest>
diff --git a/tests/CarCtsDummyLauncher/AndroidManifest.xml b/tests/CarCtsDummyLauncher/AndroidManifest.xml
index 32ada71..802326f 100644
--- a/tests/CarCtsDummyLauncher/AndroidManifest.xml
+++ b/tests/CarCtsDummyLauncher/AndroidManifest.xml
@@ -15,29 +15,29 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.car.dummylauncher">
+     package="com.android.car.dummylauncher">
 
-    <uses-sdk android:minSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="17"/>
 
-    <application
-        android:label="@string/app_name">
-        <activity
-            android:name=".LauncherActivity"
-            android:label="@string/app_name"
-            android:configChanges="uiMode|mcc|mnc"
-            android:alwaysRetainTaskState="true"
-            android:launchMode="singleTask"
-            android:clearTaskOnLaunch="true"
-            android:stateNotNeeded="true"
-            android:resumeWhilePausing="true"
-            android:windowSoftInputMode="adjustPan"
-            android:theme="@android:style/Theme.NoTitleBar">
-            <meta-data android:name="distractionOptimized" android:value="true"/>
+    <application android:label="@string/app_name">
+        <activity android:name=".LauncherActivity"
+             android:label="@string/app_name"
+             android:configChanges="uiMode|mcc|mnc"
+             android:alwaysRetainTaskState="true"
+             android:launchMode="singleTask"
+             android:clearTaskOnLaunch="true"
+             android:stateNotNeeded="true"
+             android:resumeWhilePausing="true"
+             android:windowSoftInputMode="adjustPan"
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.HOME"/>
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/CarDeveloperOptions/AndroidManifest.xml b/tests/CarDeveloperOptions/AndroidManifest.xml
index 436d7f0..66d2581 100644
--- a/tests/CarDeveloperOptions/AndroidManifest.xml
+++ b/tests/CarDeveloperOptions/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2019 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,47 +15,47 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.car.developeroptions"
-        coreApp="true"
-        android:sharedUserId="android.uid.system">
+     package="com.android.car.developeroptions"
+     coreApp="true"
+     android:sharedUserId="android.uid.system">
 
-    <original-package android:name="com.android.car.developeroptions" />
+    <original-package android:name="com.android.car.developeroptions"/>
 
-    <uses-permission android:name="android.permission.REQUEST_NETWORK_SCORES" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.HARDWARE_TEST" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.MASTER_CLEAR" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
-    <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.TETHER_PRIVILEGED" />
+    <uses-permission android:name="android.permission.REQUEST_NETWORK_SCORES"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.HARDWARE_TEST"/>
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.MASTER_CLEAR"/>
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH"/>
+    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS"/>
+    <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.TETHER_PRIVILEGED"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS"/>
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
@@ -63,138 +64,139 @@
     <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
     <uses-permission android:name="android.permission.BATTERY_STATS"/>
-    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
-    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.MOVE_PACKAGE" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.BACKUP" />
-    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <uses-permission android:name="android.permission.MANAGE_USB" />
-    <uses-permission android:name="android.permission.MANAGE_DEBUGGING" />
-    <uses-permission android:name="android.permission.SET_POINTER_SPEED" />
-    <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.COPY_PROTECTED_DATA" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />
-    <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
-    <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_MODE" />
-    <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />
-    <uses-permission android:name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE" />
-    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.REBOOT" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
-    <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
-    <uses-permission android:name="android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE" />
-    <uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
-    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" />
-    <uses-permission android:name="android.permission.USER_ACTIVITY" />
-    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
+    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS"/>
+    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.MOVE_PACKAGE"/>
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+    <uses-permission android:name="android.permission.BACKUP"/>
+    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+    <uses-permission android:name="android.permission.STATUS_BAR"/>
+    <uses-permission android:name="android.permission.MANAGE_USB"/>
+    <uses-permission android:name="android.permission.MANAGE_DEBUGGING"/>
+    <uses-permission android:name="android.permission.SET_POINTER_SPEED"/>
+    <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.COPY_PROTECTED_DATA"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"/>
+    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY"/>
+    <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_MODE"/>
+    <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
+    <uses-permission android:name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE"/>
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.REBOOT"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS"/>
+    <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES"/>
+    <uses-permission android:name="android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE"/>
+    <uses-permission android:name="android.permission.OEM_UNLOCK_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE"/>
+    <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG"/>
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT"/>
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+    <uses-permission android:name="android.permission.USE_BIOMETRIC_INTERNAL"/>
+    <uses-permission android:name="android.permission.USER_ACTIVITY"/>
+    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE"/>
     <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
-    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
-    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
+    <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES"/>
     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
-    <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
-    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
-    <uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
-    <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
-    <uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
+    <uses-permission android:name="android.permission.READ_PRINT_SERVICES"/>
+    <uses-permission android:name="android.permission.NETWORK_SETTINGS"/>
+    <uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD"/>
+    <uses-permission android:name="android.permission.USE_RESERVED_DISK"/>
+    <uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
 
     <application android:label="@string/development_settings_title"
-            android:icon="@drawable/ic_launcher_settings"
-            android:theme="@style/Theme.Settings"
-            android:hardwareAccelerated="true"
-            android:requiredForAllUsers="true"
-            android:supportsRtl="true"
-            android:allowBackup="false"
-            android:usesCleartextTraffic="true"
-            android:defaultToDeviceProtectedStorage="true"
-            android:directBootAware="true"
-            android:appComponentFactory="androidx.core.app.CoreComponentFactory">
+         android:icon="@drawable/ic_launcher_settings"
+         android:theme="@style/Theme.Settings"
+         android:hardwareAccelerated="true"
+         android:requiredForAllUsers="true"
+         android:supportsRtl="true"
+         android:allowBackup="false"
+         android:usesCleartextTraffic="true"
+         android:defaultToDeviceProtectedStorage="true"
+         android:directBootAware="true"
+         android:appComponentFactory="androidx.core.app.CoreComponentFactory">
 
-        <uses-library android:name="org.apache.http.legacy" />
+        <uses-library android:name="org.apache.http.legacy"/>
 
         <!-- Settings -->
         <activity android:name=".SubSettings"
-                android:parentActivityName="Settings" />
+             android:parentActivityName="Settings"/>
 
         <activity android:name="SetFullBackupPassword"
-                  android:label="@string/local_backup_password_title"
-                  android:exported="false" />
+             android:label="@string/local_backup_password_title"
+             android:exported="false"/>
 
-        <activity
-            android:name="Settings$DevelopmentSettingsDashboardActivity"
-            android:label="@string/development_settings_title"
-            android:icon="@drawable/ic_settings_development"
-            android:parentActivityName="Settings"
-            android:enabled="false">
+        <activity android:name="Settings$DevelopmentSettingsDashboardActivity"
+             android:label="@string/development_settings_title"
+             android:icon="@drawable/ic_settings_development"
+             android:parentActivityName="Settings"
+             android:enabled="false"
+             android:exported="true">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
+                <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
-            <meta-data android:name="com.android.settings.order" android:value="-40"/>
+            <meta-data android:name="com.android.settings.order"
+                 android:value="-40"/>
             <meta-data android:name="com.android.settings.category"
-                       android:value="com.android.settings.category.ia.system" />
+                 android:value="com.android.settings.category.ia.system"/>
             <meta-data android:name="com.android.settings.summary"
-                       android:resource="@string/summary_empty"/>
+                 android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.car.developeroptions.FRAGMENT_CLASS"
-                       android:value="com.android.car.developeroptions.development.DevelopmentSettingsDashboardFragment" />
+                 android:value="com.android.car.developeroptions.development.DevelopmentSettingsDashboardFragment"/>
             <meta-data android:name="com.android.car.developeroptions.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
+                 android:value="true"/>
         </activity>
 
         <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real
-             activity is disabled to be CTS compliant. -->
-        <activity
-            android:name=".development.DevelopmentSettingsDisabledActivity"
-            android:icon="@drawable/ic_settings_development"
-            android:label="@string/development_settings_title"
-            android:excludeFromRecents="true"
-            android:theme="@style/Transparent">
+                         activity is disabled to be CTS compliant. -->
+        <activity android:name=".development.DevelopmentSettingsDisabledActivity"
+             android:icon="@drawable/ic_settings_development"
+             android:label="@string/development_settings_title"
+             android:excludeFromRecents="true"
+             android:theme="@style/Transparent"
+             android:exported="true">
             <intent-filter android:priority="-1">
-                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
         <activity android:name=".development.AppPicker"
-                  android:label="@string/select_application"
-                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
+             android:label="@string/select_application"
+             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"/>
 
         <!-- For CtsVerifier use. -->
-        <activity
-            android:name="Settings$TrustedCredentialsSettingsActivity"
-            android:label="@string/trusted_credentials"
-            android:icon="@drawable/ic_settings_security"
-            android:parentActivityName="Settings">
+        <activity android:name="Settings$TrustedCredentialsSettingsActivity"
+             android:label="@string/trusted_credentials"
+             android:icon="@drawable/ic_settings_security"
+             android:parentActivityName="Settings"
+             android:exported="true">
             <intent-filter android:priority="1">
-                <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
-                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS"/>
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <meta-data android:name="com.android.car.developeroptions.FRAGMENT_CLASS"
-                       android:value="com.android.car.developeroptions.TrustedCredentialsSettings" />
+                 android:value="com.android.car.developeroptions.TrustedCredentialsSettings"/>
             <meta-data android:name="com.android.car.developeroptions.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
+                 android:value="true"/>
         </activity>
 
     </application>
diff --git a/tests/DiagnosticTools/AndroidManifest.xml b/tests/DiagnosticTools/AndroidManifest.xml
index 55ee4bc..1b4c830 100644
--- a/tests/DiagnosticTools/AndroidManifest.xml
+++ b/tests/DiagnosticTools/AndroidManifest.xml
@@ -16,11 +16,13 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.car.diagnostictools">
+     package="com.google.android.car.diagnostictools">
     <uses-permission android:name="android.car.permission.CAR_DIAGNOSTICS"/>
     <uses-permission android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS"/>
-    <application android:label="OBD-II Diagnostic Tools" android:theme="@style/AppTheme">
-        <activity android:name=".ECUListActivity">
+    <application android:label="OBD-II Diagnostic Tools"
+         android:theme="@style/AppTheme">
+        <activity android:name=".ECUListActivity"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
index 66e68eb..7e178d4 100644
--- a/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
+++ b/tests/EmbeddedKitchenSinkApp/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        android:sharedUserId="com.google.android.car.uid.kitchensink"
-        package="com.google.android.car.kitchensink">
+     android:sharedUserId="com.google.android.car.uid.kitchensink"
+     package="com.google.android.car.kitchensink">
     <uses-permission android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>
     <uses-permission android:name="android.car.permission.CAR_CAMERA"/>
     <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"/>
@@ -83,7 +83,7 @@
     <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG"/>
     <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT"/>
     <!-- Allow query of any normal app on the device in R+ -->
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
     <uses-permission android:name="android.permission.READ_SMS"/>
     <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
@@ -96,52 +96,55 @@
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <!-- use for vendor properties -->
-    <uses-permission android:name="android.car.permission.CAR_VENDOR_EXTENSION" />
-    <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_SEAT" />
-    <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_INFO" />
-    <uses-permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_INFO" />
+    <uses-permission android:name="android.car.permission.CAR_VENDOR_EXTENSION"/>
+    <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_SEAT"/>
+    <uses-permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_INFO"/>
+    <uses-permission android:name="android.car.permission.SET_CAR_VENDOR_CATEGORY_INFO"/>
 
     <uses-permission android:name="android.car.permission.CONTROL_CAR_FEATURES"/>
 
     <application android:label="@string/app_title"
-        android:icon="@drawable/ic_launcher">
+         android:icon="@drawable/ic_launcher">
         <uses-library android:name="android.test.runner"/>
         <!-- This is for embedded mode. -->
         <activity android:name=".KitchenSinkActivity"
-            android:theme="@style/KitchenSinkActivityTheme"
-            android:label="@string/app_title"
-            android:launchMode="singleTask">
+             android:theme="@style/KitchenSinkActivityTheme"
+             android:label="@string/app_title"
+             android:launchMode="singleTask"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="android.car.application"
-            android:resource="@xml/automotive_app_desc"/>
+        <meta-data android:name="android.car.application"
+             android:resource="@xml/automotive_app_desc"/>
 
         <activity android:name=".orientation.LandscapeActivity"
-                  android:label="@string/landscpae_activity"
-                  android:screenOrientation="landscape">
+             android:label="@string/landscpae_activity"
+             android:screenOrientation="landscape"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
         <activity android:name=".orientation.PortraitActivity"
-            android:label="@string/portrait_activity"
-            android:screenOrientation="portrait">
+             android:label="@string/portrait_activity"
+             android:screenOrientation="portrait"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
         <activity android:name=".cluster.FakeClusterNavigationActivity"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:launchMode="singleInstance"
-                  android:resizeableActivity="true"
-                  android:allowEmbedded="true">
+             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+             android:launchMode="singleInstance"
+             android:resizeableActivity="true"
+             android:allowEmbedded="true"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.car.cluster.NAVIGATION"/>
@@ -151,38 +154,42 @@
         <activity android:name=".activityview.ActivityViewTestFragment"/>
 
         <service android:name=".vendorservice.LogLifecycleService"
-                 android:exported="false" android:directBootAware="true">
+             android:exported="false"
+             android:directBootAware="true">
         </service>
 
-        <service android:name=".UserNoiticeDemoUiService" android:directBootAware="true"/>
+        <service android:name=".UserNoiticeDemoUiService"
+             android:directBootAware="true"/>
 
         <!-- Content provider for images -->
         <provider android:name=".cluster.ClusterContentProvider"
-                  android:authorities="com.google.android.car.kitchensink.cluster.clustercontentprovider"
-                  android:grantUriPermissions="true"
-                  android:exported="true"/>
+             android:authorities="com.google.android.car.kitchensink.cluster.clustercontentprovider"
+             android:grantUriPermissions="true"
+             android:exported="true"/>
 
         <activity android:name=".AlwaysCrashingActivity"
-                  android:label="@string/always_crashing_activity">
+             android:label="@string/always_crashing_activity"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
         <activity android:name=".NoCrashActivity"
-                  android:label="@string/no_crash_activity">
+             android:label="@string/no_crash_activity"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
         <activity android:name=".EmptyActivity"
-                  android:label="@string/empty_activity">
+             android:label="@string/empty_activity"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
     </application>
 </manifest>
-
diff --git a/tests/GarageModeTestApp/AndroidManifest.xml b/tests/GarageModeTestApp/AndroidManifest.xml
index b33520f..ff92cdd 100644
--- a/tests/GarageModeTestApp/AndroidManifest.xml
+++ b/tests/GarageModeTestApp/AndroidManifest.xml
@@ -13,28 +13,30 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.car.garagemode.testapp"
-    android:sharedUserId="android.uid.system">
 
-    <uses-sdk
-        android:minSdkVersion="24"
-        android:targetSdkVersion='25'/>
-    <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE" />
-    <uses-permission android:name="android.permission.BIND_JOB_SERVICE" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.google.android.car.garagemode.testapp"
+     android:sharedUserId="android.uid.system">
+
+    <uses-sdk android:minSdkVersion="24"
+         android:targetSdkVersion="25"/>
+    <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE"/>
+    <uses-permission android:name="android.permission.BIND_JOB_SERVICE"/>
 
     <application android:label="GarageModeTestApp">
         <activity android:name=".MainActivity"
-            android:theme="@style/GarageModeTheme"
-            android:label="@string/app_name">
+             android:theme="@style/GarageModeTheme"
+             android:label="@string/app_name"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <meta-data android:name="distractionOptimized" android:value="true"/>
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
         </activity>
         <service android:name=".DishService"
-            android:permission="android.permission.BIND_JOB_SERVICE">
+             android:permission="android.permission.BIND_JOB_SERVICE">
         </service>
     </application>
 </manifest>
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/AndroidManifest.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/AndroidManifest.xml
index e4d48ab..2d41d04 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/AndroidManifest.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/AndroidManifest.xml
@@ -16,23 +16,22 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.car.multidisplay">
+     package="com.android.car.multidisplay">
 
-    <uses-sdk android:minSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="17"/>
 
-    <application
-        android:label="@string/app_name">
-        <activity
-            android:name=".launcher.LauncherActivity"
-            android:label="@string/md_launcher"
-            android:theme="@style/LauncherTheme"
-            android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
+    <application android:label="@string/app_name">
+        <activity android:name=".launcher.LauncherActivity"
+             android:label="@string/md_launcher"
+             android:theme="@style/LauncherTheme"
+             android:launchMode="singleTop"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SECONDARY_HOME" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.SECONDARY_HOME"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/MultiDisplayTest/AndroidManifest.xml b/tests/MultiDisplayTest/AndroidManifest.xml
index cb294b3..cd1b3f8 100644
--- a/tests/MultiDisplayTest/AndroidManifest.xml
+++ b/tests/MultiDisplayTest/AndroidManifest.xml
@@ -13,19 +13,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- Declare the contents of this Android application.  The namespace
      attribute brings in the Android platform namespace, and the package
      supplies a unique name for the application.  When writing your
      own application, the package name must be changed from "com.example.*"
      to come from a domain that you own or have control over. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.car.multidisplaytest">
+     package="com.google.android.car.multidisplaytest">
     <application android:label="MD Test">
         <activity android:name="MDTest"
-            android:label="@string/app_title_always"
-            android:documentLaunchMode="always"
-            android:theme="@style/MainActivityTheme">
+             android:label="@string/app_title_always"
+             android:documentLaunchMode="always"
+             android:theme="@style/MainActivityTheme"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -33,4 +34,3 @@
         </activity>
     </application>
 </manifest>
-
diff --git a/tests/MultiDisplayTestHelloActivity/AndroidManifest.xml b/tests/MultiDisplayTestHelloActivity/AndroidManifest.xml
index 1929124..ba46a26 100644
--- a/tests/MultiDisplayTestHelloActivity/AndroidManifest.xml
+++ b/tests/MultiDisplayTestHelloActivity/AndroidManifest.xml
@@ -13,23 +13,27 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- Declare the contents of this Android application.  The namespace
      attribute brings in the Android platform namespace, and the package
      supplies a unique name for the application.  When writing your
      own application, the package name must be changed from "com.example.*"
      to come from a domain that you own or have control over. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.multidisplaytest.helloactivity">
+     package="com.example.android.multidisplaytest.helloactivity">
     <application android:label="MDT Hello">
-        <activity android:name="MDTHelloLaunchAlways" android:documentLaunchMode="always"
-                  android:label="@string/app_name_always">
+        <activity android:name="MDTHelloLaunchAlways"
+             android:documentLaunchMode="always"
+             android:label="@string/app_name_always"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="MDTHelloActivity" android:label="@string/app_name_default">
+        <activity android:name="MDTHelloActivity"
+             android:label="@string/app_name_default"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/SecondaryHomeApp/AndroidManifest.xml b/tests/SecondaryHomeApp/AndroidManifest.xml
index 0a84531..1a7f502 100644
--- a/tests/SecondaryHomeApp/AndroidManifest.xml
+++ b/tests/SecondaryHomeApp/AndroidManifest.xml
@@ -16,8 +16,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.car.secondaryhome">
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.car.secondaryhome">
     <!-- System permission to host maps activity -->
     <uses-permission android:name="android.permission.ACTIVITY_EMBEDDING"/>
     <!-- System permission to send events to hosted maps activity -->
@@ -30,31 +30,29 @@
     <!-- System permissions to querry user -->
     <uses-permission android:name="android.permission.MANAGE_USERS"/>
 
-    <application
-        android:label="@string/app_name"
-        tools:replace="android:label">
+    <application android:label="@string/app_name"
+         tools:replace="android:label">
 
-        <activity
-            android:name=".launcher.LauncherActivity"
-            android:label="@string/app_launcher"
-            android:theme="@style/LauncherTheme"
-            android:configChanges="orientation|screenSize|smallestScreenSize|
-                screenLayout|colorMode|density"
-            android:documentLaunchMode="always"
-            android:multiprocess="true">
+        <activity android:name=".launcher.LauncherActivity"
+             android:label="@string/app_launcher"
+             android:theme="@style/LauncherTheme"
+             android:configChanges="orientation|screenSize|smallestScreenSize|                 screenLayout|colorMode|density"
+             android:documentLaunchMode="always"
+             android:multiprocess="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <service android:name=".launcher.NotificationListener"
-              android:label="@string/notification_service_label"
-              android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
-              android:directBootAware="true">
+             android:label="@string/notification_service_label"
+             android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+             android:directBootAware="true"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService"/>
             </intent-filter>
         </service>
     </application>
 </manifest>
-
diff --git a/tests/ThemePlayground/AndroidManifest.xml b/tests/ThemePlayground/AndroidManifest.xml
index d009859..a01bd22 100644
--- a/tests/ThemePlayground/AndroidManifest.xml
+++ b/tests/ThemePlayground/AndroidManifest.xml
@@ -15,60 +15,56 @@
   ~ limitations under the License
   -->
 
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.car.themeplayground">
-    <uses-sdk
-        android:minSdkVersion="26"
-        android:targetSdkVersion="26"/>
-    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.App">
-        <activity
-            android:name=".TextSamples"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateUnchanged"
-            android:resizeableActivity="true"
-            android:allowEmbedded="true">
+     package="com.android.car.themeplayground">
+    <uses-sdk android:minSdkVersion="26"
+         android:targetSdkVersion="26"/>
+    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
+    <application android:allowBackup="true"
+         android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name"
+         android:supportsRtl="true"
+         android:theme="@style/Theme.App">
+        <activity android:name=".TextSamples"
+             android:label="@string/app_name"
+             android:windowSoftInputMode="stateUnchanged"
+             android:resizeableActivity="true"
+             android:allowEmbedded="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ColorSamples"
-            android:label="@string/panel_elements"
-            android:windowSoftInputMode="stateUnchanged"
-            android:resizeableActivity="true"
-            android:allowEmbedded="true">
+        <activity android:name=".ColorSamples"
+             android:label="@string/panel_elements"
+             android:windowSoftInputMode="stateUnchanged"
+             android:resizeableActivity="true"
+             android:allowEmbedded="true">
         </activity>
         <activity android:name=".DialogSamples"
-                  android:label="@string/dialog_elements"
-                  android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/dialog_elements"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
         <activity android:name=".WidgetsSamples"
-            android:label="@string/widgets"
-            android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/widgets"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
         <activity android:name=".RecyclerViewSamples"
-                  android:label="@string/recycler_view"
-                  android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/recycler_view"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
         <activity android:name=".CarUiRecyclerViewSamples"
-            android:label="@string/car_ui_recycler_view"
-            android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/car_ui_recycler_view"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
         <activity android:name=".DefaultThemeSamples"
-                  android:label="@string/default_themes"
-                  android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/default_themes"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
         <activity android:name=".MultipleIntentSamples"
-                  android:label="@string/multiple_intent"
-                  android:parentActivityName="com.android.car.themeplayground.TextSamples">
+             android:label="@string/multiple_intent"
+             android:parentActivityName="com.android.car.themeplayground.TextSamples">
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/UxRestrictionsSample/AndroidManifest.xml b/tests/UxRestrictionsSample/AndroidManifest.xml
index 5e1134e..8437e0c 100644
--- a/tests/UxRestrictionsSample/AndroidManifest.xml
+++ b/tests/UxRestrictionsSample/AndroidManifest.xml
@@ -13,26 +13,32 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.google.android.car.uxr.sample"
-          android:sharedUserId="android.uid.system">
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.google.android.car.uxr.sample"
+     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.car.permission.CAR_DRIVING_STATE"/>
 
     <application android:label="UxRestrictions Sample"
-                 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
-                 tools:replace="android:appComponentFactory">
-        <activity android:name=".MainActivity" android:theme="@style/AppTheme" android:launchMode="singleTask">
+         android:appComponentFactory="androidx.core.app.CoreComponentFactory"
+         tools:replace="android:appComponentFactory">
+        <activity android:name=".MainActivity"
+             android:theme="@style/AppTheme"
+             android:launchMode="singleTask"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <meta-data android:name="distractionOptimized" android:value="true"/>
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
         </activity>
         <activity android:name=".SampleMessageActivity"
-                  android:theme="@style/AppTheme">
-            <meta-data android:name="distractionOptimized" android:value="true"/>
+             android:theme="@style/AppTheme">
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
         </activity>
     </application>
 </manifest>
diff --git a/tests/VmsSubscriberClientSample/AndroidManifest.xml b/tests/VmsSubscriberClientSample/AndroidManifest.xml
index a035d05..eaad4d4 100644
--- a/tests/VmsSubscriberClientSample/AndroidManifest.xml
+++ b/tests/VmsSubscriberClientSample/AndroidManifest.xml
@@ -15,23 +15,24 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="com.google.android.car.vms.subscriber">
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.google.android.car.vms.subscriber">
           <!--android:sharedUserId="android.uid.system">-->
-    <uses-sdk android:minSdkVersion="25" android:targetSdkVersion='25'/>
+    <uses-sdk android:minSdkVersion="25"
+         android:targetSdkVersion="25"/>
 
     <uses-permission android:name="android.car.permission.VMS_SUBSCRIBER"/>
 
     <application android:label="@string/app_name"
-                 android:icon="@mipmap/ic_launcher">
-        <meta-data
-            android:name="android.car.application"
-            android:resource="@xml/automotive_app_desc"/>
-        <activity android:name=".VmsSubscriberClientSampleActivity">
+         android:icon="@mipmap/ic_launcher">
+        <meta-data android:name="android.car.application"
+             android:resource="@xml/automotive_app_desc"/>
+        <activity android:name=".VmsSubscriberClientSampleActivity"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/android_car_api_test/AndroidManifest.xml b/tests/android_car_api_test/AndroidManifest.xml
index 9f22d11..484ec1f 100644
--- a/tests/android_car_api_test/AndroidManifest.xml
+++ b/tests/android_car_api_test/AndroidManifest.xml
@@ -15,29 +15,31 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="android.car.apitest"
-        android:sharedUserId="com.google.android.car.uid.kitchensink"
-        android:debuggable="true" >
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="android.car.apitest"
+     android:sharedUserId="com.google.android.car.uid.kitchensink"
+     android:debuggable="true">
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-            android:targetPackage="android.car.apitest"
-            android:label="Tests for Car APIs"
-            android:debuggable="true" />
+         android:targetPackage="android.car.apitest"
+         android:label="Tests for Car APIs"
+         android:debuggable="true"/>
 
     <application android:label="CarApiTest"
-                 android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
-        <activity android:name=".TestCarProxyActivity">
+         android:debuggable="true">
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name=".TestCarProxyActivity"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
         <service android:name=".CarProjectionManagerTest$TestService"
-                 android:exported="true" />
+             android:exported="true"/>
         <activity android:name=".CarActivityViewDisplayIdTest$ActivityInActivityView"/>
         <activity android:name=".CarActivityViewDisplayIdTest$ActivityViewTestActivity"/>
         <activity android:name=".CarActivityViewDisplayIdTest$MultiProcessActivityViewTestActivity"
-                  android:exported="true" android:process=":activity_view_test"/>
+             android:exported="true"
+             android:process=":activity_view_test"/>
     </application>
 </manifest>
diff --git a/tests/carservice_test/AndroidManifest.xml b/tests/carservice_test/AndroidManifest.xml
index d960a72..b641dc2 100644
--- a/tests/carservice_test/AndroidManifest.xml
+++ b/tests/carservice_test/AndroidManifest.xml
@@ -15,31 +15,33 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.car.test"
-        android:sharedUserId="com.google.android.car.uid.kitchensink">
+     package="com.android.car.test"
+     android:sharedUserId="com.google.android.car.uid.kitchensink">
 
-    <uses-permission android:name="android.Manifest.permission.MODIFY_AUDIO_ROUTING" />
-    <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" />
-    <uses-permission android:name="android.car.permission.CONTROL_CAR_DOORS" />
-    <uses-permission android:name="android.car.permission.CONTROL_CAR_WINDOWS" />
-    <uses-permission android:name="android.car.permission.CONTROL_CAR_MIRRORS" />
-    <uses-permission android:name="android.car.permission.CONTROL_CAR_SEATS" />
-    <uses-permission android:name="android.car.permission.CAR_ENERGY" />
-    <uses-permission android:name="android.car.permission.CONTROL_APP_BLOCKING" />
-    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
-    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.car.permission.STORAGE_MONITORING" />
-    <uses-permission android:name="android.car.permission.READ_CAR_OCCUPANT_AWARENESS_STATE" />
+    <uses-permission android:name="android.Manifest.permission.MODIFY_AUDIO_ROUTING"/>
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE"/>
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_DOORS"/>
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_WINDOWS"/>
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_MIRRORS"/>
+    <uses-permission android:name="android.car.permission.CONTROL_CAR_SEATS"/>
+    <uses-permission android:name="android.car.permission.CAR_ENERGY"/>
+    <uses-permission android:name="android.car.permission.CONTROL_APP_BLOCKING"/>
+    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"/>
+    <uses-permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.car.permission.STORAGE_MONITORING"/>
+    <uses-permission android:name="android.car.permission.READ_CAR_OCCUPANT_AWARENESS_STATE"/>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-            android:targetPackage="com.android.car.test"
-            android:label="Tests for Car APIs"/>
+         android:targetPackage="com.android.car.test"
+         android:label="Tests for Car APIs"/>
 
-    <application android:label="CarServiceTest" android:name=".CarServiceTestApp"
-            android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
+    <application android:label="CarServiceTest"
+         android:name=".CarServiceTestApp"
+         android:debuggable="true">
+        <uses-library android:name="android.test.runner"/>
         <service android:name="com.android.car.TestAppBlockingPolicyService"
-            android:permission="android.car.permission.CONTROL_APP_BLOCKING">
+             android:permission="android.car.permission.CONTROL_APP_BLOCKING"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.car.content.pm.CarAppBlockingPolicyService"/>
             </intent-filter>
@@ -50,19 +52,20 @@
         <activity android:name="com.android.car.SystemActivityMonitoringServiceTest$ActivityC"/>
         <activity android:name="com.android.car.SystemActivityMonitoringServiceTest$ActivityThatFinishesImmediately"/>
         <activity android:name="com.android.car.SystemActivityMonitoringServiceTest$BlockingActivity"
-                  android:taskAffinity="com.android.car.carservicetest.block"/>
+             android:taskAffinity="com.android.car.carservicetest.block"/>
         <activity android:name="com.android.car.CarUxRestrictionsManagerServiceTest$ActivityViewTestActivity"/>
         <activity android:name="com.android.car.pm.ActivityBlockingActivityTest$NonDoNoHistoryActivity"
-                  android:noHistory="true"/>
+             android:noHistory="true"/>
         <activity android:name="com.android.car.pm.ActivityBlockingActivityTest$NonDoActivity"/>
         <activity android:name="com.android.car.pm.ActivityBlockingActivityTest$DoActivity"
-            android:label="DoActivity">
-            <meta-data android:name="distractionOptimized" android:value="true"/>
+             android:label="DoActivity">
+            <meta-data android:name="distractionOptimized"
+                 android:value="true"/>
         </activity>
 
         <receiver android:name="com.android.car.CarStorageMonitoringBroadcastReceiver"
-            android:exported="true"
-            android:permission="android.car.permission.STORAGE_MONITORING">
+             android:exported="true"
+             android:permission="android.car.permission.STORAGE_MONITORING">
             <intent-filter>
                 <action android:name="android.car.storagemonitoring.EXCESSIVE_IO"/>
             </intent-filter>
diff --git a/tests/obd2_app/AndroidManifest.xml b/tests/obd2_app/AndroidManifest.xml
index be6efa4..b9adf2a 100644
--- a/tests/obd2_app/AndroidManifest.xml
+++ b/tests/obd2_app/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!-- Copyright (C) 2017 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,25 +12,26 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.car.obd2app">
+     package="com.google.android.car.obd2app">
 
   <uses-permission android:name="android.permission.BLUETOOTH"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <application
-      android:allowBackup="true"
-      android:debuggable="true"
-      android:icon="@mipmap/ic_launcher"
-      android:label="@string/app_name"
-      android:supportsRtl="true"
-      android:theme="@style/AppTheme">
-    <uses-library android:name="android.test.runner" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <application android:allowBackup="true"
+       android:debuggable="true"
+       android:icon="@mipmap/ic_launcher"
+       android:label="@string/app_name"
+       android:supportsRtl="true"
+       android:theme="@style/AppTheme">
+    <uses-library android:name="android.test.runner"/>
 
-    <activity android:name=".MainActivity">
+    <activity android:name=".MainActivity"
+         android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
     <activity android:name=".SettingsActivity"/>
diff --git a/tests/usb/AoapHostApp/AndroidManifest.xml b/tests/usb/AoapHostApp/AndroidManifest.xml
index 2cac450..ff38db3 100644
--- a/tests/usb/AoapHostApp/AndroidManifest.xml
+++ b/tests/usb/AoapHostApp/AndroidManifest.xml
@@ -13,22 +13,23 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-        package="com.google.android.car.usb.aoap.host" >
-    <application android:label="@string/app_title" >
-      <uses-library android:name="android.test.runner" />
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.google.android.car.usb.aoap.host">
+    <application android:label="@string/app_title">
+      <uses-library android:name="android.test.runner"/>
 
       <activity android:name=".UsbAoapHostActivity"
-                android:configChanges="keyboard|keyboardHidden" >
+           android:configChanges="keyboard|keyboardHidden"
+           android:exported="true">
         <intent-filter>
-          <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+          <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
         </intent-filter>
-        <meta-data
-            android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-            android:resource="@xml/usb_device_filter"/>
+        <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+             android:resource="@xml/usb_device_filter"/>
       </activity>
       <service android:name=".AoapSupportCheckService"
-               android:exported="true" />
+           android:exported="true"/>
     </application>
 </manifest>
diff --git a/tests/usb/AoapPhoneCompanionApp/AndroidManifest.xml b/tests/usb/AoapPhoneCompanionApp/AndroidManifest.xml
index 7a1575f..85364cf 100644
--- a/tests/usb/AoapPhoneCompanionApp/AndroidManifest.xml
+++ b/tests/usb/AoapPhoneCompanionApp/AndroidManifest.xml
@@ -13,19 +13,20 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="com.google.android.car.usb.aoap.companion" >
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.google.android.car.usb.aoap.companion">
   <uses-sdk android:minSdkVersion="24"/>
-  <application android:label="@string/app_title" >
+  <application android:label="@string/app_title">
     <activity android:name=".AoapPhoneCompanionActivity"
-              android:configChanges="keyboard|keyboardHidden" >
+         android:configChanges="keyboard|keyboardHidden"
+         android:exported="true">
       <intent-filter>
-        <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+        <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
       </intent-filter>
-      <meta-data
-          android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
-          android:resource="@xml/accessory_filter"/>
+      <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
+           android:resource="@xml/accessory_filter"/>
     </activity>
   </application>
 </manifest>