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: I4457ff2bd466a4c56fed2570e110f251031c2385
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bb33eca4..c6e0706 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -5044,6 +5044,7 @@
                 android:relinquishTaskIdentity="true"
                 android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
                 android:process=":ui"
+                android:exported="true"
                 android:visibleToInstantApps="true">
             <intent-filter>
                 <action android:name="android.intent.action.CHOOSER" />
@@ -5155,6 +5156,7 @@
         <activity android:name="com.android.internal.app.ShutdownActivity"
             android:permission="android.permission.SHUTDOWN"
             android:theme="@style/Theme.NoDisplay"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="com.android.internal.intent.action.REQUEST_SHUTDOWN" />
@@ -5176,6 +5178,7 @@
                   android:enabled="false"
                   android:process=":ui"
                   android:systemUserOnly="true"
+                  android:exported="true"
                   android:theme="@style/Theme.Translucent.NoTitleBar">
             <intent-filter android:priority="-100">
                 <action android:name="android.intent.action.MAIN" />
@@ -5188,6 +5191,7 @@
         <activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
                 android:excludeFromRecents="true"
                 android:process=":ui"
+                android:exported="true"
                 android:theme="@style/Theme.Dialog.Confirmation">
             <intent-filter android:priority="1000">
                 <action android:name="android.os.action.CREATE_USER" />
@@ -5228,6 +5232,7 @@
         </activity>
 
         <receiver android:name="com.android.server.BootReceiver"
+                android:exported="true"
                 android:systemUserOnly="true">
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -5235,6 +5240,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.CertPinInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_PINS" />
@@ -5243,6 +5249,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_INTENT_FIREWALL" />
@@ -5251,6 +5258,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />
@@ -5259,6 +5267,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.NetworkWatchlistInstallReceiver"
+                  android:exported="true"
                   android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_NETWORK_WATCHLIST" />
@@ -5267,6 +5276,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.ApnDbInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="com.android.internal.intent.action.UPDATE_APN_DB" />
@@ -5275,6 +5285,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.CarrierProvisioningUrlsInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS" />
@@ -5283,6 +5294,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.CertificateTransparencyLogInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_CT_LOGS" />
@@ -5291,6 +5303,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.LangIdInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_LANG_ID" />
@@ -5299,6 +5312,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.SmartSelectionInstallReceiver"
+                android:exported="true"
                 android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_SMART_SELECTION" />
@@ -5307,6 +5321,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.ConversationActionsInstallReceiver"
+                  android:exported="true"
                   android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_CONVERSATION_ACTIONS" />
@@ -5315,6 +5330,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"
+                  android:exported="true"
                   android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.os.action.UPDATE_CARRIER_ID_DB" />
@@ -5323,6 +5339,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.EmergencyNumberDbInstallReceiver"
+                  android:exported="true"
                   android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.os.action.UPDATE_EMERGENCY_NUMBER_DB" />
@@ -5331,6 +5348,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.MasterClearReceiver"
+            android:exported="true"
             android:permission="android.permission.MASTER_CLEAR">
             <intent-filter
                     android:priority="100" >
@@ -5347,6 +5365,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.WallpaperUpdateReceiver"
+                  android:exported="true"
                   android:permission="android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY">
             <intent-filter>
                 <action android:name="android.intent.action.DEVICE_CUSTOMIZATION_READY"/>
@@ -5443,7 +5462,8 @@
                  android:permission="android.permission.BIND_JOB_SERVICE">
         </service>
 
-        <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader">
+        <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.LOAD_DATA" />
             </intent-filter>
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index b42fce0..21951a7 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -147,20 +147,26 @@
         <meta-data
             android:name="android.content.APP_RESTRICTIONS"
             android:resource="@xml/app_restrictions" />
-        <activity android:name="android.view.ViewAttachTestActivity" android:label="View Attach Test">
+        <activity android:name="android.view.ViewAttachTestActivity"
+            android:label="View Attach Test"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
-        <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser">
+        <activity android:name="StubTestBrowserActivity"
+            android:label="Stubbed Test Browser"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="android.test.TestBrowserTests" android:label="Test Browser Tests">
+        <activity android:name="android.test.TestBrowserTests"
+            android:label="Test Browser Tests"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.UNIT_TEST"/>
@@ -170,6 +176,7 @@
         <activity android:name="android.widget.TextViewActivity"
                 android:label="TextViewActivity"
                 android:screenOrientation="portrait"
+                android:exported="true"
                 android:theme="@android:style/Theme.Material.Light">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -180,6 +187,7 @@
         <activity android:name="android.widget.DatePickerActivity"
                 android:label="DatePickerActivity"
                 android:screenOrientation="portrait"
+                android:exported="true"
                 android:theme="@android:style/Theme.Material.Light">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -187,455 +195,533 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.DescendantFocusability" android:label="DescendantFocusability">
+        <activity android:name="android.widget.focus.DescendantFocusability"
+            android:label="DescendantFocusability"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.FocusAfterRemoval" android:label="FocusAfterRemoval">
+        <activity android:name="android.widget.focus.FocusAfterRemoval"
+            android:label="FocusAfterRemoval"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.RequestFocus" android:label="RequestFocus">
+        <activity android:name="android.widget.focus.RequestFocus"
+            android:label="RequestFocus"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.ListOfButtons" android:label="ListOfButtons">
+        <activity android:name="android.widget.focus.ListOfButtons"
+            android:label="ListOfButtons"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.LinearLayoutGrid" android:label="LinearLayoutGrid">
+        <activity android:name="android.widget.focus.LinearLayoutGrid"
+            android:label="LinearLayoutGrid"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.ListOfEditTexts" android:label="ListOfEditTexts">
+        <activity android:name="android.widget.focus.ListOfEditTexts"
+            android:label="ListOfEditTexts"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.ListOfInternalSelectionViews" android:label="ListOfInternalSelectionViews">
+        <activity android:name="android.widget.focus.ListOfInternalSelectionViews"
+            android:label="ListOfInternalSelectionViews"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.ListWithFooterViewAndNewLabels" android:label="FocusListWithFooter">
+        <activity android:name="android.widget.focus.ListWithFooterViewAndNewLabels"
+            android:label="FocusListWithFooter"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.ListWithMailMessages" android:label="ListWithMailMessages">
+        <activity android:name="android.widget.focus.ListWithMailMessages"
+            android:label="ListWithMailMessages"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.HorizontalFocusSearch" android:label="HorizontalFocusSearch">
+        <activity android:name="android.widget.focus.HorizontalFocusSearch"
+            android:label="HorizontalFocusSearch"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.VerticalFocusSearch" android:label="VerticalFocusSearch">
+        <activity android:name="android.widget.focus.VerticalFocusSearch"
+            android:label="VerticalFocusSearch"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.AdjacentVerticalRectLists" android:label="AdjacentVerticalRectLists">
+        <activity android:name="android.widget.focus.AdjacentVerticalRectLists"
+            android:label="AdjacentVerticalRectLists"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.focus.GoneParentFocusedChild" android:label="GoneParentFocusedChild">
+        <activity android:name="android.widget.focus.GoneParentFocusedChild"
+            android:label="GoneParentFocusedChild"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.frame.FrameLayoutGravity" android:label="FrameLayoutGravity">
+        <activity android:name="android.widget.layout.frame.FrameLayoutGravity" android:label="FrameLayoutGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.frame.FrameLayoutMargin" android:label="FrameLayoutMargin">
+        <activity android:name="android.widget.layout.frame.FrameLayoutMargin" android:label="FrameLayoutMargin"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.BaselineAlignmentCenterGravity" android:label="BaselineAlignmentCenterGravity">
+        <activity android:name="android.widget.layout.linear.BaselineAlignmentCenterGravity" android:label="BaselineAlignmentCenterGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.BaselineButtons" android:label="BaselineButtons">
+        <activity android:name="android.widget.layout.linear.BaselineButtons" android:label="BaselineButtons"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.FillInWrap" android:label="FillInWrap">
+        <activity android:name="android.widget.layout.linear.FillInWrap" android:label="FillInWrap"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.BaselineAlignmentZeroWidthAndWeight" android:label="Baseline0WidthAndWeight">
+        <activity android:name="android.widget.layout.linear.BaselineAlignmentZeroWidthAndWeight" android:label="Baseline0WidthAndWeight"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.HorizontalOrientationVerticalAlignment" android:label="HorizontalOrientationVerticalAlignment">
+        <activity android:name="android.widget.layout.linear.HorizontalOrientationVerticalAlignment" android:label="HorizontalOrientationVerticalAlignment"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.LLEditTextThenButton" android:label="LLEditTextThenButton">
+        <activity android:name="android.widget.layout.linear.LLEditTextThenButton" android:label="LLEditTextThenButton"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.LLOfButtons1" android:label="LLOfButtons1">
+        <activity android:name="android.widget.layout.linear.LLOfButtons1" android:label="LLOfButtons1"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.LinearLayoutEditTexts" android:label="LinearLayoutEditTexts">
+        <activity android:name="android.widget.layout.linear.LinearLayoutEditTexts" android:label="LinearLayoutEditTexts"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.LLOfButtons2" android:label="LLOfButtons2">
+        <activity android:name="android.widget.layout.linear.LLOfButtons2" android:label="LLOfButtons2"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.LLOfTwoFocusableInTouchMode" android:label="LLOfTwoFocusableInTouchMode">
+        <activity android:name="android.widget.layout.linear.LLOfTwoFocusableInTouchMode" android:label="LLOfTwoFocusableInTouchMode"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.Weight" android:label="Weight">
+        <activity android:name="android.widget.layout.linear.Weight" android:label="Weight"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.linear.WeightSum" android:label="WeightSum">
+        <activity android:name="android.widget.layout.linear.WeightSum" android:label="WeightSum"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.AdjacentListsWithAdjacentISVsInside" android:label="AdjacentListsWithAdjacentISVsInside">
+        <activity android:name="android.widget.listview.AdjacentListsWithAdjacentISVsInside" android:label="AdjacentListsWithAdjacentISVsInside"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListDividers" android:label="ListDividers">
+        <activity android:name="android.widget.listview.ListDividers" android:label="ListDividers"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListViewHeight" android:label="ListViewHeight">
+        <activity android:name="android.widget.listview.ListViewHeight" android:label="ListViewHeight"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.FixedWidth" android:label="CellFixedWidth">
+        <activity android:name="android.widget.layout.table.FixedWidth" android:label="CellFixedWidth"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.Weight" android:label="CellWeight">
+        <activity android:name="android.widget.layout.table.Weight" android:label="CellWeight"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.HorizontalGravity" android:label="CellHorizontalGravity">
+        <activity android:name="android.widget.layout.table.HorizontalGravity" android:label="CellHorizontalGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.VerticalGravity" android:label="CellVerticalGravity">
+        <activity android:name="android.widget.layout.table.VerticalGravity" android:label="CellVerticalGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.AddColumn" android:label="AddColumnInTable">
+        <activity android:name="android.widget.layout.table.AddColumn" android:label="AddColumnInTable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.layout.table.CellSpan" android:label="CellSpan">
+        <activity android:name="android.widget.layout.table.CellSpan" android:label="CellSpan"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.ButtonAboveTallInternalSelectionView" android:label="ButtonAboveTallInternalSelectionView">
+        <activity android:name="android.widget.scroll.ButtonAboveTallInternalSelectionView" android:label="ButtonAboveTallInternalSelectionView"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.ButtonsWithTallTextViewInBetween" android:label="scrollButtonsWithTallTextViewInBetween">
+        <activity android:name="android.widget.scroll.ButtonsWithTallTextViewInBetween" android:label="scrollButtonsWithTallTextViewInBetween"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.RequestRectangleVisible" android:label="ScrollToChildRect">
+        <activity android:name="android.widget.scroll.RequestRectangleVisible" android:label="ScrollToChildRect"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.RequestRectangleVisibleWithInternalScroll" android:label="ScrollToChildRectWithInternalScroll">
+        <activity android:name="android.widget.scroll.RequestRectangleVisibleWithInternalScroll" android:label="ScrollToChildRectWithInternalScroll"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.ScrollViewButtonsAndLabels" android:label="ScrollViewButtonsAndLabels">
+        <activity android:name="android.widget.scroll.ScrollViewButtonsAndLabels" android:label="ScrollViewButtonsAndLabels"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.ShortButtons" android:label="scrollShortButtons">
+        <activity android:name="android.widget.scroll.ShortButtons" android:label="scrollShortButtons"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.TallTextAboveButton" android:label="scrollTallTextAboveButton">
+        <activity android:name="android.widget.scroll.TallTextAboveButton" android:label="scrollTallTextAboveButton"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.scroll.arrowscroll.MultiPageTextWithPadding" android:label="arrowscrollMultiPageTextWithPadding">
+        <activity android:name="android.widget.scroll.arrowscroll.MultiPageTextWithPadding" android:label="arrowscrollMultiPageTextWithPadding"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.Include" android:label="IncludeTag">
+        <activity android:name="android.view.Include" android:label="IncludeTag"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.Merge" android:label="MergeTag">
+        <activity android:name="android.view.Merge" android:label="MergeTag"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.ScaleGesture" android:label="ScaleGesture">
+        <activity android:name="android.view.ScaleGesture" android:label="ScaleGesture"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.StubbedView" android:label="ViewStub">
+        <activity android:name="android.view.StubbedView" android:label="ViewStub"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.RunQueue" android:label="RunQueue">
+        <activity android:name="android.view.RunQueue" android:label="RunQueue"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.Visibility" android:label="Visibility">
+        <activity android:name="android.view.Visibility" android:label="Visibility"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.VisibilityCallback" android:label="VisibilityCallback">
+        <activity android:name="android.view.VisibilityCallback" android:label="VisibilityCallback"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.BigCache" android:label="BigCache">
+        <activity android:name="android.view.BigCache" android:label="BigCache"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.ZeroSized" android:label="ZeroSized">
+        <activity android:name="android.view.ZeroSized" android:label="ZeroSized"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.Disabled" android:label="Disabled">
+        <activity android:name="android.view.Disabled" android:label="Disabled"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.PopupWindowVisibility" android:label="PopupWindowVisibility">
+        <activity android:name="android.view.PopupWindowVisibility" android:label="PopupWindowVisibility"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.PreDrawListener" android:label="PreDrawListener">
+        <activity android:name="android.view.PreDrawListener" android:label="PreDrawListener"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.GlobalFocusChange" android:label="GlobalFocusChange">
+        <activity android:name="android.view.GlobalFocusChange" android:label="GlobalFocusChange"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListSetSelection" android:label="ListSetSelection">
+        <activity android:name="android.widget.listview.ListSetSelection" android:label="ListSetSelection"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListSimple" android:label="ListSimple">
+        <activity android:name="android.widget.listview.ListSimple" android:label="ListSimple"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListFilter" android:label="ListFilter">
+        <activity android:name="android.widget.listview.ListFilter" android:label="ListFilter"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListScrollListener" android:label="ListScrollListener">
+        <activity android:name="android.widget.listview.ListScrollListener" android:label="ListScrollListener"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListThrasher" android:label="ListThrasher">
+        <activity android:name="android.widget.listview.ListThrasher" android:label="ListThrasher"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListTakeFocusFromSide" android:label="ListTakeFocusFromSide">
+        <activity android:name="android.widget.listview.ListTakeFocusFromSide" android:label="ListTakeFocusFromSide"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListBottomGravity" android:label="ListBottomGravity">
+        <activity android:name="android.widget.listview.ListBottomGravity" android:label="ListBottomGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListBottomGravityMany" android:label="ListBottomGravityMany">
+        <activity android:name="android.widget.listview.ListBottomGravityMany" android:label="ListBottomGravityMany"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -643,105 +729,120 @@
         </activity>
 
 
-        <activity android:name="android.widget.listview.ListButtonsDiagonalAcrossItems" android:label="ListButtonsDiagonalAcrossItems">
+        <activity android:name="android.widget.listview.ListButtonsDiagonalAcrossItems" android:label="ListButtonsDiagonalAcrossItems"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListTopGravity" android:label="ListTopGravity">
+        <activity android:name="android.widget.listview.ListTopGravity" android:label="ListTopGravity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListTopGravityMany" android:label="ListTopGravityMany">
+        <activity android:name="android.widget.listview.ListTopGravityMany" android:label="ListTopGravityMany"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListEndingWithMultipleSeparators" android:label="ListEndingWithMultipleSeparators">
+        <activity android:name="android.widget.listview.ListEndingWithMultipleSeparators" android:label="ListEndingWithMultipleSeparators"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListGetSelectedView" android:label="ListGetSelectedView">
+        <activity android:name="android.widget.listview.ListGetSelectedView" android:label="ListGetSelectedView"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListInHorizontal" android:label="ListInHorizontal">
+        <activity android:name="android.widget.listview.ListInHorizontal" android:label="ListInHorizontal"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListInVertical" android:label="ListInVertical">
+        <activity android:name="android.widget.listview.ListInVertical" android:label="ListInVertical"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListInterleaveFocusables" android:label="ListInterleaveFocusables">
+        <activity android:name="android.widget.listview.ListInterleaveFocusables" android:label="ListInterleaveFocusables"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
              <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
          </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfItemsShorterThanScreen" android:label="ListOfItemsShorterThanScreen">
+        <activity android:name="android.widget.listview.ListOfItemsShorterThanScreen" android:label="ListOfItemsShorterThanScreen"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfItemsTallerThanScreen" android:label="ListOfItemsTallerThanScreen">
+        <activity android:name="android.widget.listview.ListOfItemsTallerThanScreen" android:label="ListOfItemsTallerThanScreen"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfThinItems" android:label="ListOfThinItems">
+        <activity android:name="android.widget.listview.ListOfThinItems" android:label="ListOfThinItems"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfShortTallShort" android:label="ListOfShortTallShort">
+        <activity android:name="android.widget.listview.ListOfShortTallShort" android:label="ListOfShortTallShort"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfShortShortTallShortShort" android:label="ListOfShortShortTallShortShort">
+        <activity android:name="android.widget.listview.ListOfShortShortTallShortShort" android:label="ListOfShortShortTallShortShort"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithOffScreenNextSelectable" android:label="ListWithOffScreenNextSelectable">
+        <activity android:name="android.widget.listview.ListWithOffScreenNextSelectable" android:label="ListWithOffScreenNextSelectable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithFirstScreenUnSelectable" android:label="ListWithFirstScreenUnSelectable">
+        <activity android:name="android.widget.listview.ListWithFirstScreenUnSelectable" android:label="ListWithFirstScreenUnSelectable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -749,329 +850,376 @@
         </activity>
 
 
-        <activity android:name="android.widget.listview.ListWithSeparators" android:label="ListWithSeparators">
+        <activity android:name="android.widget.listview.ListWithSeparators" android:label="ListWithSeparators"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithHeaders" android:label="ListWithHeaders">
+        <activity android:name="android.widget.listview.ListWithHeaders" android:label="ListWithHeaders"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithEditTextHeader" android:label="ListWithEditTextHeader">
+        <activity android:name="android.widget.listview.ListWithEditTextHeader" android:label="ListWithEditTextHeader"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithNoFadingEdge" android:label="ListWithNoFadingEdge">
+        <activity android:name="android.widget.listview.ListWithNoFadingEdge" android:label="ListWithNoFadingEdge"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithScreenOfNoSelectables" android:label="ListWithScreenOfNoSelectables">
+        <activity android:name="android.widget.listview.ListWithScreenOfNoSelectables" android:label="ListWithScreenOfNoSelectables"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListItemFocusablesFarApart" android:label="ListItemFocusablesFarApart">
+        <activity android:name="android.widget.listview.ListItemFocusablesFarApart" android:label="ListItemFocusablesFarApart"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListItemFocusableAboveUnfocusable" android:label="ListItemFocusableAboveUnfocusable">
+        <activity android:name="android.widget.listview.ListItemFocusableAboveUnfocusable" android:label="ListItemFocusableAboveUnfocusable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListItemFocusablesClose" android:label="ListItemFocusablesClose">
+        <activity android:name="android.widget.listview.ListItemFocusablesClose" android:label="ListItemFocusablesClose"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListLastItemPartiallyVisible" android:label="ListLastItemPartiallyVisible">
+        <activity android:name="android.widget.listview.ListLastItemPartiallyVisible" android:label="ListLastItemPartiallyVisible"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListItemsExpandOnSelection" android:label="ListItemsExpandOnSelection">
+        <activity android:name="android.widget.listview.ListItemsExpandOnSelection" android:label="ListItemsExpandOnSelection"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithOnItemSelectedAction" android:label="ListWithOnItemSelectedAction">
+        <activity android:name="android.widget.listview.ListWithOnItemSelectedAction" android:label="ListWithOnItemSelectedAction"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListItemISVAndButton" android:label="ListItemISVAndButton">
+        <activity android:name="android.widget.listview.ListItemISVAndButton" android:label="ListItemISVAndButton"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListOfTouchables" android:label="ListOfTouchables">
+        <activity android:name="android.widget.listview.ListOfTouchables" android:label="ListOfTouchables"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListRecyclerProfiling" android:label="ListRecyclerProfiling">
+        <activity android:name="android.widget.listview.ListRecyclerProfiling" android:label="ListRecyclerProfiling"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListHeterogeneous" android:label="ListHeterogeneous">
+        <activity android:name="android.widget.listview.ListHeterogeneous" android:label="ListHeterogeneous"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListHorizontalFocusWithinItemWins" android:label="ListHorizontalFocusWithinItemWins">
+        <activity android:name="android.widget.listview.ListHorizontalFocusWithinItemWins" android:label="ListHorizontalFocusWithinItemWins"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-      <activity android:name="android.widget.listview.ListManagedCursor" android:label="ListManagedCursor">
+      <activity android:name="android.widget.listview.ListManagedCursor" android:label="ListManagedCursor"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-      <activity android:name="android.widget.listview.ListWithEmptyView" android:label="ListWithEmptyView">
+      <activity android:name="android.widget.listview.ListWithEmptyView" android:label="ListWithEmptyView"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridInHorizontal" android:label="GridInHorizontal">
+        <activity android:name="android.widget.gridview.GridInHorizontal" android:label="GridInHorizontal"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridPadding" android:label="GridPadding">
+        <activity android:name="android.widget.gridview.GridPadding" android:label="GridPadding"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridInVertical" android:label="GridInVertical">
+        <activity android:name="android.widget.gridview.GridInVertical" android:label="GridInVertical"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridScrollListener" android:label="GridScrollListener">
+        <activity android:name="android.widget.gridview.GridScrollListener" android:label="GridScrollListener"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-         <activity android:name="android.widget.gridview.GridThrasher" android:label="GridThrasher">
+         <activity android:name="android.widget.gridview.GridThrasher" android:label="GridThrasher"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridSimple" android:label="GridSimple">
+        <activity android:name="android.widget.gridview.GridSimple" android:label="GridSimple"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
            </intent-filter>
        </activity>
 
-        <activity android:name="android.widget.gridview.GridDelete" android:label="GridDelete">
+        <activity android:name="android.widget.gridview.GridDelete" android:label="GridDelete"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-         <activity android:name="android.widget.gridview.GridSetSelection" android:label="GridSetSelection">
+         <activity android:name="android.widget.gridview.GridSetSelection" android:label="GridSetSelection"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridSetSelectionMany" android:label="GridSetSelectionMany">
+        <activity android:name="android.widget.gridview.GridSetSelectionMany" android:label="GridSetSelectionMany"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottom" android:label="GridSetSelectionStackFromBottom">
+        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottom" android:label="GridSetSelectionStackFromBottom"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottomMany" android:label="GridSetSelectionStackFromBottomMany">
+        <activity android:name="android.widget.gridview.GridSetSelectionStackFromBottomMany" android:label="GridSetSelectionStackFromBottomMany"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridStackFromBottom" android:label="GridStackFromBottom">
+        <activity android:name="android.widget.gridview.GridStackFromBottom" android:label="GridStackFromBottom"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridStackFromBottomMany" android:label="GridStackFromBottomMany">
+        <activity android:name="android.widget.gridview.GridStackFromBottomMany" android:label="GridStackFromBottomMany"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridVerticalSpacing" android:label="GridVerticalSpacing">
+        <activity android:name="android.widget.gridview.GridVerticalSpacing" android:label="GridVerticalSpacing"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridVerticalSpacingStackFromBottom" android:label="GridVerticalSpacingStackFromBottom">
+        <activity android:name="android.widget.gridview.GridVerticalSpacingStackFromBottom" android:label="GridVerticalSpacingStackFromBottom"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.gridview.GridSingleColumn" android:label="GridSingleColumn">
+        <activity android:name="android.widget.gridview.GridSingleColumn" android:label="GridSingleColumn"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.menu.ListContextMenu" android:label="ListContextMenu">
+        <activity android:name="android.view.menu.ListContextMenu" android:label="ListContextMenu"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.ViewGroupChildren" android:label="ViewGroup Children">
+        <activity android:name="android.view.ViewGroupChildren" android:label="ViewGroup Children"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.ViewTransientState" android:label="View Transient State">
+        <activity android:name="android.view.ViewTransientState" android:label="View Transient State"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.RemoteViewsActivity" android:label="RemoteViewsActicity">
+        <activity android:name="android.view.RemoteViewsActivity" android:label="RemoteViewsActicity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.BitmapDrawable" android:label="BitmapDrawable">
+        <activity android:name="android.view.BitmapDrawable" android:label="BitmapDrawable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.DrawableBgMinSize" android:label="DrawableBgMinSize">
+        <activity android:name="android.view.DrawableBgMinSize" android:label="DrawableBgMinSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.MutateDrawable" android:label="MutateDrawable">
+        <activity android:name="android.view.MutateDrawable" android:label="MutateDrawable"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.app.TranslucentFancyActivity" android:label="TranslucentFancyActivity">
+        <activity android:name="android.app.TranslucentFancyActivity" android:label="TranslucentFancyActivity"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
            </intent-filter>
        </activity>
 
-        <activity android:name="android.view.Longpress" android:label="Longpress">
+        <activity android:name="android.view.Longpress" android:label="Longpress"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.expandablelistview.ExpandableListWithHeaders" android:label="ExpandableListWithHeaders">
+        <activity android:name="android.widget.expandablelistview.ExpandableListWithHeaders" android:label="ExpandableListWithHeaders"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.listview.ListWithDisappearingItemBug" android:label="ListWithDisappearingItemBug">
+        <activity android:name="android.widget.listview.ListWithDisappearingItemBug" android:label="ListWithDisappearingItemBug"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.menu.ContextMenuActivity" android:label="ContextMenu" android:theme="@android:style/Theme.Material">
+        <activity android:name="android.view.menu.ContextMenuActivity" android:label="ContextMenu" android:theme="@android:style/Theme.Material"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.menu.MenuWith1Item" android:label="MenuWith1Item">
+        <activity android:name="android.view.menu.MenuWith1Item" android:label="MenuWith1Item"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1079,6 +1227,7 @@
         </activity>
 
         <activity android:name="android.view.menu.MenuLayoutPortrait" android:label="MenuLayoutPortrait"
+                android:exported="true"
                 android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1087,6 +1236,7 @@
         </activity>
 
         <activity android:name="android.view.menu.MenuLayoutLandscape" android:label="MenuLayoutLandscape"
+                android:exported="true"
                 android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1094,21 +1244,24 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.expandablelistview.InflatedExpandableListView" android:label="ExpandableListView Inflated">
+        <activity android:name="android.widget.expandablelistview.InflatedExpandableListView" android:label="ExpandableListView Inflated"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.expandablelistview.ExpandableListSimple" android:label="ExpandableListSimple">
+        <activity android:name="android.widget.expandablelistview.ExpandableListSimple" android:label="ExpandableListSimple"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.os.BrightnessLimit" android:label="BrightnessLimit">
+        <activity android:name="android.os.BrightnessLimit" android:label="BrightnessLimit"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1116,7 +1269,8 @@
         </activity>
 
         <activity android:name="android.widget.AutoCompleteTextViewSimple"
-                  android:label="AutoCompleteTextViewSimple">
+                  android:label="AutoCompleteTextViewSimple"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1124,34 +1278,39 @@
         </activity>
 
         <service android:name="android.webkit.AccessibilityInjectorTest$MockAccessibilityService"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService" />
             </intent-filter>
         </service>
 
-        <activity android:name="android.widget.RadioGroupActivity" android:label="RadioGroupActivity">
+        <activity android:name="android.widget.RadioGroupActivity" android:label="RadioGroupActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.TextViewTestActivity" android:label="TextViewTestActivity">
+        <activity android:name="android.widget.TextViewTestActivity" android:label="TextViewTestActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.ViewCaptureTestActivity" android:label="ViewCaptureTestActivity">
+        <activity android:name="android.view.ViewCaptureTestActivity" android:label="ViewCaptureTestActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.app.Activity" android:label="Empty Activity">
+        <activity android:name="android.app.Activity" android:label="Empty Activity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1159,7 +1318,8 @@
         </activity>
 
         <activity android:name="android.view.accessibility.AccessibilityTestActivity"
-                  android:label="AccessibilityTestActivity" >
+                  android:label="AccessibilityTestActivity"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1222,12 +1382,14 @@
         <activity android:name="com.android.internal.app.ResolverWrapperActivity"/>
         <activity android:name="com.android.internal.app.IntentForwarderActivityTest$IntentForwarderWrapperActivity"/>
 
-        <receiver android:name="android.app.activity.AbortReceiver">
+        <receiver android:name="android.app.activity.AbortReceiver"
+            android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />
             </intent-filter>
         </receiver>
-        <receiver android:name="android.app.activity.LocalReceiver">
+        <receiver android:name="android.app.activity.LocalReceiver"
+            android:exported="true">
             <intent-filter android:priority="-1">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ALL" />
@@ -1243,25 +1405,29 @@
             <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />
             <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />
         </receiver>
-        <receiver android:name="android.app.activity.ResultReceiver">
+        <receiver android:name="android.app.activity.ResultReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_RESULT" />
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.LocalGrantedReceiver"
-                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED">
+                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED"
+                android:exported="true">
             <intent-filter android:priority="-1">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_LOCAL_GRANTED" />
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.LocalDeniedReceiver"
-                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED">
+                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED"
+                android:exported="true">
             <intent-filter android:priority="-1">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_LOCAL_DENIED" />
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.RemoteReceiver"
-                android:process=":remoteReceiver">
+                android:process=":remoteReceiver"
+                android:exported="true">
             <intent-filter android:priority="2">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ALL" />
@@ -1270,13 +1436,15 @@
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.RemoteGrantedReceiver"
-                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED">
+                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED"
+                android:exported="true">
             <intent-filter android:priority="2">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REMOTE_GRANTED" />
             </intent-filter>
         </receiver>
         <receiver android:name="android.app.activity.RemoteDeniedReceiver"
-                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED">
+                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED"
+                android:exported="true">
             <intent-filter android:priority="2">
                 <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REMOTE_DENIED" />
             </intent-filter>
@@ -1361,7 +1529,8 @@
         <!-- Application components used for search manager tests -->
 
         <activity android:name="android.app.activity.SearchableActivity"
-                android:label="Searchable Activity">
+                android:label="Searchable Activity"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1374,7 +1543,8 @@
                 android:authorities="android.app.SuggestionProvider">
         </provider>
 
-        <activity android:name="android.webkit.AccessibilityInjectorTestActivity">
+        <activity android:name="android.webkit.AccessibilityInjectorTestActivity"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1382,7 +1552,8 @@
         </activity>
 
         <activity android:name="android.animation.BasicAnimatorActivity"
-                  android:screenOrientation="locked">
+                  android:screenOrientation="locked"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1390,14 +1561,16 @@
         </activity>
 
         <activity android:name="android.animation.AnimatorSetActivity"
-                  android:screenOrientation="locked">
+                  android:screenOrientation="locked"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
             </intent-filter>
         </activity>
 
-        <activity android:name="android.content.res.ResourceCacheActivity">
+        <activity android:name="android.content.res.ResourceCacheActivity"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -1410,7 +1583,8 @@
 
         <service
             android:name="android.print.test.services.FirstPrintService"
-            android:permission="android.permission.BIND_PRINT_SERVICE">
+            android:permission="android.permission.BIND_PRINT_SERVICE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.printservice.PrintService" />
             </intent-filter>
@@ -1451,7 +1625,8 @@
                 android:exported="true" />
 
         <activity android:name="android.app.assist.EmptyLayoutActivity"
-                  android:label="My Title">
+                  android:label="My Title"
+                  android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
diff --git a/core/tests/coretests/EnabledTestApp/AndroidManifest.xml b/core/tests/coretests/EnabledTestApp/AndroidManifest.xml
index 72d933a..1925c90 100644
--- a/core/tests/coretests/EnabledTestApp/AndroidManifest.xml
+++ b/core/tests/coretests/EnabledTestApp/AndroidManifest.xml
@@ -13,40 +13,49 @@
      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.android.frameworks.coretests.enabled_app"
-        android:sharedUserId="com.android.uid.test">
+     package="com.android.frameworks.coretests.enabled_app"
+     android:sharedUserId="com.android.uid.test">
 
     <application>
 
         <!-- Used to test package component enabling and disabling -->
-        <activity android:name=".DisabledActivity" android:enabled="false" >
+        <activity android:name=".DisabledActivity"
+             android:enabled="false"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.frameworks.coretests.enabled_app.TEST_CATEGORY" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.frameworks.coretests.enabled_app.TEST_CATEGORY"/>
             </intent-filter>
         </activity>
-        <service android:name=".DisabledService" android:enabled="false" >
+        <service android:name=".DisabledService"
+             android:enabled="false">
         </service>
-        <receiver android:name=".DisabledReceiver" android:enabled="false" >
+        <receiver android:name=".DisabledReceiver"
+             android:enabled="false"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.ENABLED_APP_DISABLED_RECEIVER" />
+                <action android:name="android.intent.action.ENABLED_APP_DISABLED_RECEIVER"/>
             </intent-filter>
         </receiver>
-        <provider android:name=".DisabledProvider" android:enabled="false"
-                  android:authorities="com.android.frameworks.coretests.enabled_app.DisabledProvider"
-                  android:process=":disabled.provider.process" />
-        <activity android:name=".EnabledActivity" >
+        <provider android:name=".DisabledProvider"
+             android:enabled="false"
+             android:authorities="com.android.frameworks.coretests.enabled_app.DisabledProvider"
+             android:process=":disabled.provider.process"/>
+        <activity android:name=".EnabledActivity">
         </activity>
-        <service android:name=".EnabledService" android:enabled="true" >
+        <service android:name=".EnabledService"
+             android:enabled="true">
         </service>
-        <receiver android:name=".EnabledReceiver" >
+        <receiver android:name=".EnabledReceiver"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.ENABLED_APP_ENABLED_RECEIVER" />
+                <action android:name="android.intent.action.ENABLED_APP_ENABLED_RECEIVER"/>
             </intent-filter>
         </receiver>
         <provider android:name=".EnabledProvider"
-                  android:authorities="com.android.frameworks.coretests.enabled_app.EnabledProvider"
-                  android:process=":enabled.provider.process" />
+             android:authorities="com.android.frameworks.coretests.enabled_app.EnabledProvider"
+             android:process=":enabled.provider.process"/>
     </application>
 </manifest>
diff --git a/core/tests/coretests/apks/install_jni_lib_open_from_apk/AndroidManifest.xml b/core/tests/coretests/apks/install_jni_lib_open_from_apk/AndroidManifest.xml
index 190f894..6b14517 100644
--- a/core/tests/coretests/apks/install_jni_lib_open_from_apk/AndroidManifest.xml
+++ b/core/tests/coretests/apks/install_jni_lib_open_from_apk/AndroidManifest.xml
@@ -13,15 +13,19 @@
      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.android.frameworks.coretests.install_jni_lib_open_from_apk">
 
-    <application android:hasCode="true" android:label="@string/app_name" android:extractNativeLibs="false">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.frameworks.coretests.install_jni_lib_open_from_apk">
+
+    <application android:hasCode="true"
+         android:label="@string/app_name"
+         android:extractNativeLibs="false">
         <activity android:name="com.android.frameworks.coretests.OpenFromApkActivity"
-           android:label="@string/app_name">
+             android:label="@string/app_name"
+             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>
     </application>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml
index d9d9eb2..78c8881 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.multidexlegacyandexception"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.android.multidexlegacyandexception"
+     android:versionCode="1"
+     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18"/>
+    <uses-sdk android:minSdkVersion="8"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name="com.android.multidexlegacyandexception.TestApplication"
-        android:label="multidexlegacyandexception"
-        >
-        <activity
-            android:name="com.android.multidexlegacyandexception.MainActivity"
-            android:label="multidexlegacyandexception" >
+    <application android:name="com.android.multidexlegacyandexception.TestApplication"
+         android:label="multidexlegacyandexception">
+        <activity android:name="com.android.multidexlegacyandexception.MainActivity"
+             android:label="multidexlegacyandexception"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="com.android.test.runner.MultiDexTestRunner"
-                     android:targetPackage="com.android.multidexlegacyandexception"
-                     android:label="Test for MultiDexLegacyAndException" />
+         android:targetPackage="com.android.multidexlegacyandexception"
+         android:label="Test for MultiDexLegacyAndException"/>
 
     <instrumentation android:name="com.android.multidexlegacyandexception.tests.MultiDexAndroidJUnitRunner"
-                     android:targetPackage="com.android.multidexlegacyandexception"
-                     android:label="Test for MultiDexLegacyAndException" />
+         android:targetPackage="com.android.multidexlegacyandexception"
+         android:label="Test for MultiDexLegacyAndException"/>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.multidexlegacyandexception"
-                     android:label="Test for MultiDexLegacyAndException" />
+         android:targetPackage="com.android.multidexlegacyandexception"
+         android:label="Test for MultiDexLegacyAndException"/>
 </manifest>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/AndroidManifest.xml
index 6bd47c2..1a60c1e 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/AndroidManifest.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.multidexlegacytestapp"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.android.multidexlegacytestapp"
+     android:versionCode="1"
+     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18"/>
+    <uses-sdk android:minSdkVersion="8"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name=".TestApplication"
-        android:label="multidexlegacytestapp"
-        >
-        <activity
-            android:name="com.android.multidexlegacytestapp.MainActivity"
-            android:label="multidexlegacytestapp" >
+    <application android:name=".TestApplication"
+         android:label="multidexlegacytestapp">
+        <activity android:name="com.android.multidexlegacytestapp.MainActivity"
+             android:label="multidexlegacytestapp"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.multidexlegacytestapp"
-                     android:label="Test for MultiDexLegacyTestApp" />
+         android:targetPackage="com.android.multidexlegacytestapp"
+         android:label="Test for MultiDexLegacyTestApp"/>
 </manifest>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml
index 5f006fe..9a4c3c5 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.framework.multidexlegacycorrupteddex"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.android.framework.multidexlegacycorrupteddex"
+     android:versionCode="1"
+     android:versionName="1.0">
 
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="18"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name="androidx.multidex.MultiDexApplication"
-        android:allowBackup="true"
-        android:label="MultiDexLegacyTestApp_corrupted">
-        <activity
-            android:name="com.android.framework.multidexlegacycorrupteddex.MainActivity"
-            android:label="MultiDexLegacyTestApp_corrupted" >
+    <application android:name="androidx.multidex.MultiDexApplication"
+         android:allowBackup="true"
+         android:label="MultiDexLegacyTestApp_corrupted">
+        <activity android:name="com.android.framework.multidexlegacycorrupteddex.MainActivity"
+             android:label="MultiDexLegacyTestApp_corrupted"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.framework.multidexlegacycorrupteddex"
-                     android:label="Test for MultiDexLegacyTestApp_corrupted" />
+         android:targetPackage="com.android.framework.multidexlegacycorrupteddex"
+         android:label="Test for MultiDexLegacyTestApp_corrupted"/>
 
 </manifest>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml
index f3f11b9..8c911c4 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/AndroidManifest.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.framework.multidexlegacyversionedtestapp"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.android.framework.multidexlegacyversionedtestapp"
+     android:versionCode="1"
+     android:versionName="1.0">
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="9"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name="androidx.multidex.MultiDexApplication"
-        android:allowBackup="true"
-        android:label="MultiDexLegacyVersionedTestApp_v1">
-        <activity
-            android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
-            android:label="MultiDexLegacyVersionedTestApp_v1" >
+    <application android:name="androidx.multidex.MultiDexApplication"
+         android:allowBackup="true"
+         android:label="MultiDexLegacyVersionedTestApp_v1">
+        <activity android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
+             android:label="MultiDexLegacyVersionedTestApp_v1"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
-                     android:label="Test for MultiDexLegacyVersionedTestApp_v1" />
+         android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
+         android:label="Test for MultiDexLegacyVersionedTestApp_v1"/>
 
 </manifest>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml
index e43e56b..1817e95 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/AndroidManifest.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.framework.multidexlegacyversionedtestapp"
-    android:versionCode="2"
-    android:versionName="2.0" >
+     package="com.android.framework.multidexlegacyversionedtestapp"
+     android:versionCode="2"
+     android:versionName="2.0">
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="9"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name="androidx.multidex.MultiDexApplication"
-        android:allowBackup="true"
-        android:label="MultiDexLegacyVersionedTestApp_v2">
-        <activity
-            android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
-            android:label="MultiDexLegacyVersionedTestApp_v2" >
+    <application android:name="androidx.multidex.MultiDexApplication"
+         android:allowBackup="true"
+         android:label="MultiDexLegacyVersionedTestApp_v2">
+        <activity android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
+             android:label="MultiDexLegacyVersionedTestApp_v2"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
-                     android:label="Test for MultiDexLegacyVersionedTestApp_v2" />
+         android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
+         android:label="Test for MultiDexLegacyVersionedTestApp_v2"/>
 
 </manifest>
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml
index 1d97228..c8a41bc 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/AndroidManifest.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.framework.multidexlegacyversionedtestapp"
-    android:versionCode="3"
-    android:versionName="3.0" >
+     package="com.android.framework.multidexlegacyversionedtestapp"
+     android:versionCode="3"
+     android:versionName="3.0">
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="9"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:name="androidx.multidex.MultiDexApplication"
-        android:allowBackup="true"
-        android:label="MultiDexLegacyVersionedTestApp_v3">
-        <activity
-            android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
-            android:label="MultiDexLegacyVersionedTestApp_v3" >
+    <application android:name="androidx.multidex.MultiDexApplication"
+         android:allowBackup="true"
+         android:label="MultiDexLegacyVersionedTestApp_v3">
+        <activity android:name="com.android.framework.multidexlegacyversionedtestapp.MainActivity"
+             android:label="MultiDexLegacyVersionedTestApp_v3"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
-                     android:label="Test for MultiDexLegacyVersionedTestApp_v3" />
+         android:targetPackage="com.android.framework.multidexlegacyversionedtestapp"
+         android:label="Test for MultiDexLegacyVersionedTestApp_v3"/>
 
 </manifest>
diff --git a/core/tests/hosttests/test-apps/SharedUid/32/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/32/AndroidManifest.xml
index 8aaf5d65..5453f53 100644
--- a/core/tests/hosttests/test-apps/SharedUid/32/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/SharedUid/32/AndroidManifest.xml
@@ -13,16 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- This is an example of writing an application that bundles a
      native code library. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.bit32" android:sharedUserId="com.framework.shareduid">
+     package="com.framework.shareduid.bit32"
+     android:sharedUserId="com.framework.shareduid">
     <application android:label="Main Activity (32 bit)">
-        <activity android:name="MainActivity">
+        <activity android:name="MainActivity"
+             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>
     </application>
diff --git a/core/tests/hosttests/test-apps/SharedUid/64/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/64/AndroidManifest.xml
index c3d51ef..177ef40 100644
--- a/core/tests/hosttests/test-apps/SharedUid/64/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/SharedUid/64/AndroidManifest.xml
@@ -13,16 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- This is an example of writing an application that bundles a
      native code library. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.bit64" android:sharedUserId="com.framework.shareduid">
+     package="com.framework.shareduid.bit64"
+     android:sharedUserId="com.framework.shareduid">
     <application android:label="Main Activity (64 bit)">
-        <activity android:name="MainActivity">
+        <activity android:name="MainActivity"
+             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>
     </application>
diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
index b7ff46a..998e19b 100644
--- a/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/SharedUid/dual/dual/AndroidManifest.xml
@@ -13,16 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- This is an example of writing an application that bundles a
      native code library. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.dual" android:sharedUserId="com.framework.shareduid">
+     package="com.framework.shareduid.dual"
+     android:sharedUserId="com.framework.shareduid">
     <application android:label="Main Activity (dual)">
-        <activity android:name="MainActivity">
+        <activity android:name="MainActivity"
+             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>
     </application>
diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml
index d53ba50..017ca91 100644
--- a/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/SharedUid/dual/multiarch/AndroidManifest.xml
@@ -13,16 +13,19 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- This is an example of writing an application that bundles a
      native code library. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.multiarch" android:sharedUserId="com.framework.shareduid">
-    <application android:label="Main Activity (multiarch)" android:multiArch="true">
-        <activity android:name="com.framework.shareduid.dual.MainActivity">
+     package="com.framework.shareduid.multiarch"
+     android:sharedUserId="com.framework.shareduid">
+    <application android:label="Main Activity (multiarch)"
+         android:multiArch="true">
+        <activity android:name="com.framework.shareduid.dual.MainActivity"
+             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>
     </application>
diff --git a/core/tests/hosttests/test-apps/SharedUid/java_only/AndroidManifest.xml b/core/tests/hosttests/test-apps/SharedUid/java_only/AndroidManifest.xml
index c52689a..591c69b 100644
--- a/core/tests/hosttests/test-apps/SharedUid/java_only/AndroidManifest.xml
+++ b/core/tests/hosttests/test-apps/SharedUid/java_only/AndroidManifest.xml
@@ -13,16 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- This is an example of writing an application that bundles a
      native code library. -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.framework.shareduid.java" android:sharedUserId="com.framework.shareduid">
+     package="com.framework.shareduid.java"
+     android:sharedUserId="com.framework.shareduid">
     <application android:label="Main Activity (java only)">
-        <activity android:name="MainActivity">
+        <activity android:name="MainActivity"
+             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>
     </application>
diff --git a/libs/usb/tests/AccessoryChat/AndroidManifest.xml b/libs/usb/tests/AccessoryChat/AndroidManifest.xml
index 6667eba..b93eeab 100644
--- a/libs/usb/tests/AccessoryChat/AndroidManifest.xml
+++ b/libs/usb/tests/AccessoryChat/AndroidManifest.xml
@@ -15,26 +15,28 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.accessorychat">
+     package="com.android.accessorychat">
 
-    <uses-feature android:name="android.hardware.usb.accessory" />
+    <uses-feature android:name="android.hardware.usb.accessory"/>
 
     <application android:label="Accessory Chat">
 
-        <activity android:name="AccessoryChat" android:label="Accessory Chat">
+        <activity android:name="AccessoryChat"
+             android:label="Accessory Chat"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
             <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" />
+                 android:resource="@xml/accessory_filter"/>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="12" />
+    <uses-sdk android:minSdkVersion="12"/>
 </manifest>
diff --git a/media/mca/samples/CameraEffectsRecordingSample/AndroidManifest.xml b/media/mca/samples/CameraEffectsRecordingSample/AndroidManifest.xml
index a65129d..807596e 100644
--- a/media/mca/samples/CameraEffectsRecordingSample/AndroidManifest.xml
+++ b/media/mca/samples/CameraEffectsRecordingSample/AndroidManifest.xml
@@ -15,22 +15,25 @@
  * limitations under the License.
  *
  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="1"
-      android:versionName="1.0" package="android.media.filterfw.samples">
-    <uses-sdk android:minSdkVersion="3" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+     android:versionCode="1"
+     android:versionName="1.0"
+     package="android.media.filterfw.samples">
+    <uses-sdk android:minSdkVersion="3"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-feature android:name="android.hardware.camera"/>
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
     <application android:label="@string/app_name"
-                 android:debuggable="true">
+         android:debuggable="true">
         <activity android:name=".CameraEffectsRecordingSample"
-                  android:label="@string/app_name">
+             android:label="@string/app_name"
+             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>
     </application>
diff --git a/media/packages/BluetoothMidiService/AndroidManifest.xml b/media/packages/BluetoothMidiService/AndroidManifest.xml
index 1cfd55d..c12b513 100644
--- a/media/packages/BluetoothMidiService/AndroidManifest.xml
+++ b/media/packages/BluetoothMidiService/AndroidManifest.xml
@@ -1,17 +1,20 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.bluetoothmidiservice"
-        >
+<?xml version="1.0" encoding="utf-8"?>
 
-    <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
-    <uses-feature android:name="android.software.midi" android:required="true"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.bluetoothmidiservice">
+
+    <uses-feature android:name="android.hardware.bluetooth_le"
+         android:required="true"/>
+    <uses-feature android:name="android.software.midi"
+         android:required="true"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
 
-    <application
-        android:label="@string/app_name">
+    <application android:label="@string/app_name">
         <service android:name=".BluetoothMidiService"
-            android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE">
+             android:permission="android.permission.BIND_MIDI_DEVICE_SERVICE"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.media.midi.BluetoothMidiService" />
+                <action android:name="android.media.midi.BluetoothMidiService"/>
             </intent-filter>
         </service>
     </application>
diff --git a/media/tests/CameraBrowser/AndroidManifest.xml b/media/tests/CameraBrowser/AndroidManifest.xml
index c35d12a..98aa0ae 100644
--- a/media/tests/CameraBrowser/AndroidManifest.xml
+++ b/media/tests/CameraBrowser/AndroidManifest.xml
@@ -1,25 +1,29 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.camerabrowser">
+<?xml version="1.0" encoding="utf-8"?>
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.camerabrowser">
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application android:label="@string/app_label"
-            android:name="com.android.camerabrowser.CameraBrowserApplication">
+         android:name="com.android.camerabrowser.CameraBrowserApplication">
 
-        <activity android:name="CameraBrowser" android:label="Camera Browser">
+        <activity android:name="CameraBrowser"
+             android:label="Camera Browser"
+             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>
             <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/device_filter" />
+                 android:resource="@xml/device_filter"/>
         </activity>
 
-        <activity android:name="StorageBrowser" />
-        <activity android:name="ObjectBrowser" />
-        <activity android:name="ObjectViewer" />
+        <activity android:name="StorageBrowser"/>
+        <activity android:name="ObjectBrowser"/>
+        <activity android:name="ObjectViewer"/>
     </application>
 </manifest>
diff --git a/media/tests/EffectsTest/AndroidManifest.xml b/media/tests/EffectsTest/AndroidManifest.xml
index 9b59891..27c903b 100644
--- a/media/tests/EffectsTest/AndroidManifest.xml
+++ b/media/tests/EffectsTest/AndroidManifest.xml
@@ -15,42 +15,43 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.effectstest">
+     package="com.android.effectstest">
 
-   <uses-permission android:name="android.permission.RECORD_AUDIO" />
-   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
 
    <application>
         <activity android:label="@string/app_name"
-                android:name="EffectsTest">
+             android:name="EffectsTest"
+             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"/>
             </intent-filter>
         </activity>
 
         <activity android:label="@string/envreverb_test_name"
-                android:name="EnvReverbTest">
+             android:name="EnvReverbTest">
         </activity>
 
         <activity android:label="@string/presetrvb_test_name"
-                android:name="PresetReverbTest">
+             android:name="PresetReverbTest">
         </activity>
 
         <activity android:label="@string/equalizer_test_name"
-                android:name="EqualizerTest">
+             android:name="EqualizerTest">
         </activity>
 
         <activity android:label="@string/virtualizer_test_name"
-                android:name="VirtualizerTest">
+             android:name="VirtualizerTest">
         </activity>
 
         <activity android:label="@string/bassboost_test_name"
-                android:name="BassBoostTest">
+             android:name="BassBoostTest">
         </activity>
 
         <activity android:label="@string/visualizer_test_name"
-                android:name="VisualizerTest">
+             android:name="VisualizerTest">
         </activity>
 
     </application>
diff --git a/media/tests/MediaDump/AndroidManifest.xml b/media/tests/MediaDump/AndroidManifest.xml
index 6cd9f81..388317d 100644
--- a/media/tests/MediaDump/AndroidManifest.xml
+++ b/media/tests/MediaDump/AndroidManifest.xml
@@ -13,35 +13,38 @@
      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.android.mediadump">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-feature android:glEsVersion="0x00020000" />
+     package="com.android.mediadump">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-feature android:glEsVersion="0x00020000"/>
     <application android:label="@string/app_name">
         <activity android:name=".MediaDump"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+             android:label="@string/app_name"
+             android:screenOrientation="landscape"
+             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+             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=".VideoDumpActivity"
-		  android:label="@string/app_name">
+             android:label="@string/app_name"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>
         </activity>
         <activity android:name=".RgbPlayerActivity"
-		  android:label="@string/app_name">
+             android:label="@string/app_name"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index 070ed72..33872ed 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -15,85 +15,86 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.mediaframeworktest">
+     package="com.android.mediaframeworktest">
 
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <application android:networkSecurityConfig="@xml/network_security_config">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
         <activity android:label="@string/app_name"
-                android:name="MediaFrameworkTest"
-                android:screenOrientation="landscape">
+             android:name="MediaFrameworkTest"
+             android:screenOrientation="landscape"
+             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"/>
             </intent-filter>
         </activity>
         <activity android:label="Camera2CtsActivity"
-                android:name="Camera2SurfaceViewActivity"
-                android:screenOrientation="landscape"
-                android:configChanges="keyboardHidden|orientation|screenSize">
+             android:name="Camera2SurfaceViewActivity"
+             android:screenOrientation="landscape"
+             android:configChanges="keyboardHidden|orientation|screenSize">
         </activity>
     </application>
 
     <instrumentation android:name=".CameraStressTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="Camera stress tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="Camera stress tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".Camera2InstrumentationTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="Camera2 InstrumentationTestRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="Camera2 InstrumentationTestRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaFrameworkTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="MediaFramework tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="MediaFramework tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaFrameworkPerfTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="MediaFramework Performance tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="MediaFramework Performance tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaFrameworkUnitTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="MediaFramework unit tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="MediaFramework unit tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaRecorderStressTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="MediaRecorder stress tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="MediaRecorder stress tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".AudioTestHarnessTemplateRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="Audio Test Harness tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="Audio Test Harness tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaFrameworkPowerTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="Media Power tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="Media Power tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaPlayerStressTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="Media Power tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="Media Power tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name=".MediaFrameworkIntegrationTestRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="MediaFramework integration tests InstrumentationRunner">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="MediaFramework integration tests InstrumentationRunner">
     </instrumentation>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-            android:targetPackage="com.android.mediaframeworktest"
-            android:label="media framework tests">
+         android:targetPackage="com.android.mediaframeworktest"
+         android:label="media framework tests">
     </instrumentation>
 
 </manifest>
diff --git a/media/tests/ScoAudioTest/AndroidManifest.xml b/media/tests/ScoAudioTest/AndroidManifest.xml
index 8ff973e..a0fba73 100644
--- a/media/tests/ScoAudioTest/AndroidManifest.xml
+++ b/media/tests/ScoAudioTest/AndroidManifest.xml
@@ -15,22 +15,23 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.scoaudiotest">
-   
-   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-   <uses-permission android:name="android.permission.RECORD_AUDIO" />
-   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-   <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-   <uses-permission android:name="android.permission.BLUETOOTH" />
-        
+     package="com.android.scoaudiotest">
+
+   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+   <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+   <uses-permission android:name="android.permission.BLUETOOTH"/>
+
    <application>    
         <activity android:label="@string/app_name"
-                android:name="ScoAudioTest">         
+             android:name="ScoAudioTest"
+             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"/>
             </intent-filter>
         </activity>
-        
+
     </application>   
 </manifest>
diff --git a/media/tests/SoundPoolTest/AndroidManifest.xml b/media/tests/SoundPoolTest/AndroidManifest.xml
index 8a29052..c18efa2 100644
--- a/media/tests/SoundPoolTest/AndroidManifest.xml
+++ b/media/tests/SoundPoolTest/AndroidManifest.xml
@@ -1,12 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-package="com.android.soundpooltest">
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.soundpooltest">
     <application>
-        <activity  android:name="SoundPoolTest" android:label="Sound Pool Test">
+        <activity android:name="SoundPoolTest"
+             android:label="Sound Pool Test"
+             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>
     </application>
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
+    <uses-sdk android:minSdkVersion="8"
+         android:targetSdkVersion="8"/>
 </manifest>
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 62447b5..7d2a869 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -692,7 +692,8 @@
                   android:visibleToInstantApps="true">
         </activity>
 
-        <receiver android:name=".controls.management.ControlsRequestReceiver">
+        <receiver android:name=".controls.management.ControlsRequestReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.service.controls.action.ADD_CONTROL" />
             </intent-filter>
diff --git a/samples/training/network-usage/AndroidManifest.xml b/samples/training/network-usage/AndroidManifest.xml
index 4b96d14..3cd4651 100644
--- a/samples/training/network-usage/AndroidManifest.xml
+++ b/samples/training/network-usage/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2012 The Android Open Source Project
 
@@ -15,33 +16,34 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.networkusage"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.example.android.networkusage"
+     android:versionCode="1"
+     android:versionName="1.0">
 
     <uses-sdk android:minSdkVersion="4"
-        android:targetSdkVersion="14" />
+         android:targetSdkVersion="14"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
+    <application android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name">
 
-        <activity
-            android:name="com.example.networkusage.NetworkActivity"
-            android:label="@string/app_name" >
+        <activity android:name="com.example.networkusage.NetworkActivity"
+             android:label="@string/app_name"
+             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:label="SettingsActivity" android:name=".SettingsActivity">
+        <activity android:label="SettingsActivity"
+             android:name=".SettingsActivity"
+             android:exported="true">
              <intent-filter>
-                <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MANAGE_NETWORK_USAGE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
           </intent-filter>
         </activity>
     </application>
diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml
index 1212f20..ef9224f 100644
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -15,218 +15,234 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.frameworks.servicestests">
+     package="com.android.frameworks.servicestests">
 
-    <uses-permission android:name="android.permission.READ_LOGS" />
-    <uses-permission android:name="android.permission.ACCESS_VR_MANAGER" />
-    <uses-permission android:name="android.permission.ACCOUNT_MANAGER" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
-    <uses-permission android:name="android.permission.MANAGE_APP_TOKENS" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.REAL_GET_TASKS" />
-    <uses-permission android:name="android.permission.GET_DETAILED_TASKS" />
-    <uses-permission android:name="android.permission.REORDER_TASKS" />
-    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />
-    <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" />
-    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />
-    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
-    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />
-    <uses-permission android:name="android.permission.INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-    <uses-permission android:name="android.permission.DELETE_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />
-    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.ACCESS_VR_MANAGER"/>
+    <uses-permission android:name="android.permission.ACCOUNT_MANAGER"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.BROADCAST_STICKY"/>
+    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
+    <uses-permission android:name="android.permission.MANAGE_APP_TOKENS"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+    <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
+    <uses-permission android:name="android.permission.GET_DETAILED_TASKS"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+    <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY"/>
+    <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
+    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS"/>
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
+    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT"/>
+    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+    <uses-permission android:name="android.permission.INSTALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
+    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+    <uses-permission android:name="android.permission.GET_APP_OPS_STATS"/>
+    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS"/>
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES"/>
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" />
-    <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />
-    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
-    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.STORAGE_INTERNAL" />
-    <uses-permission android:name="android.permission.WATCH_APPOPS" />
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES"/>
+    <uses-permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE"/>
+    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER"/>
+    <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.STORAGE_INTERNAL"/>
+    <uses-permission android:name="android.permission.WATCH_APPOPS"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.SUSPEND_APPS"/>
-    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE" />
-    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
+    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
+    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>
     <uses-permission android:name="android.permission.CONTROL_KEYGUARD"/>
     <uses-permission android:name="android.permission.MANAGE_BIND_INSTANT_SERVICE"/>
-    <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />
-    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
-    <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG" />
+    <uses-permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+    <uses-permission android:name="android.permission.WRITE_DEVICE_CONFIG"/>
     <uses-permission android:name="android.permission.HARDWARE_TEST"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
-    <uses-permission android:name="android.permission.DUMP" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+    <uses-permission android:name="android.permission.DUMP"/>
     <uses-permission android:name="android.permission.READ_DREAM_STATE"/>
     <uses-permission android:name="android.permission.WRITE_DREAM_STATE"/>
 
     <!-- Uses API introduced in O (26) -->
     <uses-sdk android:minSdkVersion="1"
-          android:targetSdkVersion="26"/>
+         android:targetSdkVersion="26"/>
 
     <application android:testOnly="true">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
         <service android:name="com.android.server.accounts.TestAccountType1AuthenticatorService"
-            android:exported="false">
+             android:exported="false">
           <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
+            <action android:name="android.accounts.AccountAuthenticator"/>
           </intent-filter>
           <meta-data android:name="android.accounts.AccountAuthenticator"
-              android:resource="@xml/test_account_type1_authenticator" />
+               android:resource="@xml/test_account_type1_authenticator"/>
         </service>
 
         <service android:name="com.android.server.accounts.TestAccountType2AuthenticatorService"
-            android:exported="false">
+             android:exported="false">
           <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
+            <action android:name="android.accounts.AccountAuthenticator"/>
           </intent-filter>
           <meta-data android:name="android.accounts.AccountAuthenticator"
-              android:resource="@xml/test_account_type2_authenticator" />
+               android:resource="@xml/test_account_type2_authenticator"/>
         </service>
 
         <receiver android:name="com.android.server.devicepolicy.ApplicationRestrictionsTest$AdminReceiver"
-                android:permission="android.permission.BIND_DEVICE_ADMIN">
+             android:permission="android.permission.BIND_DEVICE_ADMIN"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                       android:resource="@xml/device_admin_sample" />
+                 android:resource="@xml/device_admin_sample"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$Admin1"
-            android:permission="android.permission.BIND_DEVICE_ADMIN">
+             android:permission="android.permission.BIND_DEVICE_ADMIN"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                android:resource="@xml/device_admin_sample" />
+                 android:resource="@xml/device_admin_sample"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$Admin2"
-            android:permission="android.permission.BIND_DEVICE_ADMIN">
+             android:permission="android.permission.BIND_DEVICE_ADMIN"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                android:resource="@xml/device_admin_sample" />
+                 android:resource="@xml/device_admin_sample"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$Admin3"
-            android:permission="android.permission.BIND_DEVICE_ADMIN">
+             android:permission="android.permission.BIND_DEVICE_ADMIN"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                android:resource="@xml/device_admin_sample" />
+                 android:resource="@xml/device_admin_sample"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$AdminNoPerm">
+        <receiver android:name="com.android.server.devicepolicy.DummyDeviceAdmins$AdminNoPerm"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                android:resource="@xml/device_admin_sample" />
+                 android:resource="@xml/device_admin_sample"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
 
         <service android:name="com.android.server.job.MockPriorityJobService"
-                 android:permission="android.permission.BIND_JOB_SERVICE" />
+             android:permission="android.permission.BIND_JOB_SERVICE"/>
 
-        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity" />
-        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2" />
-        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3" />
+        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity"/>
+        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2"/>
+        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3"/>
 
         <activity android:name="com.android.server.pm.ShortcutTestActivity"
-                 android:enabled="true" android:exported="true" />
+             android:enabled="true"
+             android:exported="true"/>
 
         <activity android:name="com.android.server.pm.SuspendedDetailsActivity"
-                  android:enabled="true"
-                  android:permission="android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS">
+             android:enabled="true"
+             android:permission="android.permission.SEND_SHOW_SUSPENDED_APP_DETAILS"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.SHOW_SUSPENDED_APP_DETAILS" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.SHOW_SUSPENDED_APP_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.server.accounts.AccountAuthenticatorDummyActivity" />
-        <activity android:name="com.android.server.adb.AdbDebuggingManagerTestActivity" />
+        <activity android:name="com.android.server.accounts.AccountAuthenticatorDummyActivity"/>
+        <activity android:name="com.android.server.adb.AdbDebuggingManagerTestActivity"/>
 
         <activity-alias android:name="a.ShortcutEnabled"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="true" android:exported="true">
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="true"
+             android:exported="true">
         </activity-alias>
         <activity-alias android:name="a.ShortcutDisabled"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="false" android:exported="true">
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="false"
+             android:exported="true">
+            <meta-data android:name="android.app.shortcuts"
+                 android:resource="@xml/shortcut_5"/>
         </activity-alias>
         <activity-alias android:name="a.ShortcutUnexported"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="true" android:exported="false">
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="true"
+             android:exported="false">
+            <meta-data android:name="android.app.shortcuts"
+                 android:resource="@xml/shortcut_5"/>
         </activity-alias>
         <activity-alias android:name="a.Shortcut1"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="true" android:exported="true">
-            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_1"/>
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="true"
+             android:exported="true">
+            <meta-data android:name="android.app.shortcuts"
+                 android:resource="@xml/shortcut_1"/>
         </activity-alias>
         <activity-alias android:name="a.ShortcutConfigActivity"
-                        android:targetActivity="com.android.server.pm.ShortcutTestActivity">
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity">
             <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
             </intent-filter>
         </activity-alias>
 
         <activity-alias android:name="a.DisabledMain"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="false" android:exported="true">
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="false"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
 
         <activity-alias android:name="a.UnexportedMain"
-            android:targetActivity="com.android.server.pm.ShortcutTestActivity"
-            android:enabled="true" android:exported="false">
+             android:targetActivity="com.android.server.pm.ShortcutTestActivity"
+             android:enabled="true"
+             android:exported="false">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
 
-        <receiver android:name="com.android.server.appwidget.DummyAppWidget">
+        <receiver android:name="com.android.server.appwidget.DummyAppWidget"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider"
-              android:resource="@xml/dummy_appwidget_info" />
+                 android:resource="@xml/dummy_appwidget_info"/>
         </receiver>
     </application>
 
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.frameworks.servicestests"
-        android:label="Frameworks Services Tests" />
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+         android:targetPackage="com.android.frameworks.servicestests"
+         android:label="Frameworks Services Tests"/>
 </manifest>
diff --git a/services/tests/servicestests/apks/install-split-base/AndroidManifest.xml b/services/tests/servicestests/apks/install-split-base/AndroidManifest.xml
index 2979395..1ff41e1 100644
--- a/services/tests/servicestests/apks/install-split-base/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/install-split-base/AndroidManifest.xml
@@ -15,14 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.frameworks.servicestests.install_split"
-        android:isolatedSplits="true">
+     package="com.android.frameworks.servicestests.install_split"
+     android:isolatedSplits="true">
 
     <application android:label="ClassloaderSplitApp">
-        <activity android:name=".BaseActivity">
+        <activity android:name=".BaseActivity"
+             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>
     </application>
diff --git a/services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml b/services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml
index a3dd55f..dfeec8c 100644
--- a/services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/install-split-feature-a/AndroidManifest.xml
@@ -15,14 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.frameworks.servicestests.install_split"
-        featureSplit="feature_a">
+     package="com.android.frameworks.servicestests.install_split"
+     featureSplit="feature_a">
 
     <application>
-        <activity android:name=".feature_a.FeatureAActivity">
+        <activity android:name=".feature_a.FeatureAActivity"
+             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>
     </application>
diff --git a/services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml b/services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml
index fc7134d2..d60e194 100644
--- a/services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml
+++ b/services/tests/servicestests/apks/install_intent_filters/AndroidManifest.xml
@@ -14,34 +14,29 @@
   ~ 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.android.frameworks.servicestests.install_intent_filters">
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.frameworks.servicestests.install_intent_filters">
 
 <!--
-     This manifest declares an activity for testing intent filters.
-     The implementing class is an empty implementation.
--->
+         This manifest declares an activity for testing intent filters.
+         The implementing class is an empty implementation.
+    -->
 
-    <uses-feature
-        android:name="com.android.frameworks.servicestests.nonexistent" />
-    <uses-configuration
-        android:reqFiveWayNav="false" />
+    <uses-feature android:name="com.android.frameworks.servicestests.nonexistent"/>
+    <uses-configuration android:reqFiveWayNav="false"/>
 
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.frameworks.coretests"
-        android:label="Frameworks Core Tests" />
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+         android:targetPackage="com.android.frameworks.coretests"
+         android:label="Frameworks Core Tests"/>
 
-    <permission
-        android:label="test permission"
-        android:name="test_permission"
-        android:protectionLevel="normal" />
+    <permission android:label="test permission"
+         android:name="test_permission"
+         android:protectionLevel="normal"/>
 
-    <application
-        android:hasCode="true">
-        <activity
-            android:name="com.android.frameworks.servicestests.TestActivity">
+    <application android:hasCode="true">
+        <activity android:name="com.android.frameworks.servicestests.TestActivity"
+             android:exported="true">
             <intent-filter>
                 <action android:name="action1"/>
                 <data android:mimeGroup="mime_group_1"/>
diff --git a/startop/apps/ColorChanging/app/src/main/AndroidManifest.xml b/startop/apps/ColorChanging/app/src/main/AndroidManifest.xml
index 37193b5..2186d20 100644
--- a/startop/apps/ColorChanging/app/src/main/AndroidManifest.xml
+++ b/startop/apps/ColorChanging/app/src/main/AndroidManifest.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.startop.colorchanging">
+     package="com.android.startop.colorchanging">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="com.android.startop.colorchanging.MainActivity">
+    <application android:allowBackup="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name="com.android.startop.colorchanging.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>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/AccessibilityEventsLogger/AndroidManifest.xml b/tests/AccessibilityEventsLogger/AndroidManifest.xml
index d86769f..a571367 100644
--- a/tests/AccessibilityEventsLogger/AndroidManifest.xml
+++ b/tests/AccessibilityEventsLogger/AndroidManifest.xml
@@ -16,25 +16,23 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.android.tests.accessibilityeventlogger"
-    android:versionCode="1"
-    android:versionName="0.0" >
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.tests.accessibilityeventlogger"
+     android:versionCode="1"
+     android:versionName="0.0">
 
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="18"
+         android:targetSdkVersion="18"/>
 
-    <application
-        android:allowBackup="true"
-        android:enabled="true"
-        android:label="@string/app_name" >
+    <application android:allowBackup="true"
+         android:enabled="true"
+         android:label="@string/app_name">
 
-        <service
-            android:name=".AELogger"
-            android:enabled="true"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
-            android:configChanges="locale" >
+        <service android:name=".AELogger"
+             android:enabled="true"
+             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+             android:configChanges="locale"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService"/>
 
@@ -43,9 +41,8 @@
                 <category android:name="android.accessibilityservice.category.FEEDBACK_AUDIBLE"/>
             </intent-filter>
 
-            <meta-data
-                android:name="android.accessibilityservice"
-                android:resource="@xml/accessibilityservice" />
+            <meta-data android:name="android.accessibilityservice"
+                 android:resource="@xml/accessibilityservice"/>
         </service>
     </application>
 </manifest>
diff --git a/tests/AccessoryDisplay/sink/AndroidManifest.xml b/tests/AccessoryDisplay/sink/AndroidManifest.xml
index 72d498f..2aee969 100644
--- a/tests/AccessoryDisplay/sink/AndroidManifest.xml
+++ b/tests/AccessoryDisplay/sink/AndroidManifest.xml
@@ -15,26 +15,27 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.accessorydisplay.sink" >
+     package="com.android.accessorydisplay.sink">
 
     <uses-feature android:name="android.hardware.usb.host"/>
-    <uses-sdk android:minSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="18"/>
 
     <application android:label="@string/app_name"
-            android:icon="@drawable/ic_app"
-            android:hardwareAccelerated="true">
+         android:icon="@drawable/ic_app"
+         android:hardwareAccelerated="true">
 
         <activity android:name=".SinkActivity"
-                android:label="@string/app_name"
-                android:theme="@android:style/Theme.Holo">
+             android:label="@string/app_name"
+             android:theme="@android:style/Theme.Holo"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
-                    android:resource="@xml/usb_device_filter"/>
+                 android:resource="@xml/usb_device_filter"/>
         </activity>
 
     </application>
diff --git a/tests/AccessoryDisplay/source/AndroidManifest.xml b/tests/AccessoryDisplay/source/AndroidManifest.xml
index d3edcb8..4611e1d 100644
--- a/tests/AccessoryDisplay/source/AndroidManifest.xml
+++ b/tests/AccessoryDisplay/source/AndroidManifest.xml
@@ -15,26 +15,27 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.accessorydisplay.source" >
+     package="com.android.accessorydisplay.source">
 
     <uses-feature android:name="android.hardware.usb.accessory"/>
-    <uses-sdk android:minSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="18"/>
 
     <application android:label="@string/app_name"
-            android:icon="@drawable/ic_app"
-            android:hardwareAccelerated="true">
+         android:icon="@drawable/ic_app"
+         android:hardwareAccelerated="true">
 
         <activity android:name=".SourceActivity"
-                android:label="@string/app_name"
-                android:theme="@android:style/Theme.Holo">
+             android:label="@string/app_name"
+             android:theme="@android:style/Theme.Holo"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
                 <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
-                    android:resource="@xml/usb_accessory_filter"/>
+                 android:resource="@xml/usb_accessory_filter"/>
         </activity>
 
     </application>
diff --git a/tests/ActivityManagerPerfTests/stub-app/AndroidManifest.xml b/tests/ActivityManagerPerfTests/stub-app/AndroidManifest.xml
index a57f64c..6bdeea0 100644
--- a/tests/ActivityManagerPerfTests/stub-app/AndroidManifest.xml
+++ b/tests/ActivityManagerPerfTests/stub-app/AndroidManifest.xml
@@ -16,39 +16,34 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.stubs.am">
+     package="com.android.stubs.am">
 
     <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    <application android:label="Android TestCase" >
-        <provider
-                android:authorities="@string/authority"
-                android:name=".TestContentProvider"
-                android:exported="true" />
-        <receiver
-                android:name=".TestBroadcastReceiver"
-                android:exported="true">
+    <application android:label="Android TestCase">
+        <provider android:authorities="@string/authority"
+             android:name=".TestContentProvider"
+             android:exported="true"/>
+        <receiver android:name=".TestBroadcastReceiver"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.stubs.am.ACTION_BROADCAST_TEST" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.stubs.am.ACTION_BROADCAST_TEST"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
-        <service
-                android:name=".InitService"
-                android:exported="true" />
-        <service
-                android:name=".TestService"
-                android:exported="true" />
-        <activity
-                android:name=".TestActivity"
-                android:excludeFromRecents="true"
-                android:turnScreenOn="true"
-                android:launchMode="singleTask">
+        <service android:name=".InitService"
+             android:exported="true"/>
+        <service android:name=".TestService"
+             android:exported="true"/>
+        <activity android:name=".TestActivity"
+             android:excludeFromRecents="true"
+             android:turnScreenOn="true"
+             android:launchMode="singleTask"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.stubs.am.ACTION_START_TEST_ACTIVITY" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.stubs.am.ACTION_START_TEST_ACTIVITY"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
 
 </manifest>
-
diff --git a/tests/ActivityTests/AndroidManifest.xml b/tests/ActivityTests/AndroidManifest.xml
index 0b3bd70..88a5e64 100644
--- a/tests/ActivityTests/AndroidManifest.xml
+++ b/tests/ActivityTests/AndroidManifest.xml
@@ -15,85 +15,98 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.activity">
-    <uses-permission android:name="android.permission.REAL_GET_TASKS" />
-    <uses-permission android:name="android.permission.REORDER_TASKS" />
-    <uses-permission android:name="android.permission.REMOVE_TASKS" />
-    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-    <uses-sdk android:targetSdkVersion="22" />
+     package="com.google.android.test.activity">
+    <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+    <uses-permission android:name="android.permission.REMOVE_TASKS"/>
+    <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-sdk android:targetSdkVersion="22"/>
     <application android:label="ActivityTest">
-        <activity android:name="ActivityTestMain">
+        <activity android:name="ActivityTestMain"
+             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>
             <intent-filter>
-                <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" android:host="www.angryredplanet.com"
-                        android:pathPrefix="" />
+                <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"
+                     android:host="www.angryredplanet.com"
+                     android:pathPrefix=""/>
             </intent-filter>
             <preferred>
-                <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" android:host="www.angryredplanet.com"
-                        android:pathPrefix="" />
+                <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"
+                     android:host="www.angryredplanet.com"
+                     android:pathPrefix=""/>
             </preferred>
         </activity>
-        <activity android:name="SpamActivity" android:label="Spam!"
-                android:documentLaunchMode="always">
+        <activity android:name="SpamActivity"
+             android:label="Spam!"
+             android:documentLaunchMode="always">
         </activity>
-        <activity android:name="DocActivity" android:label="Some doc">
+        <activity android:name="DocActivity"
+             android:label="Some doc">
         </activity>
         <service android:name="SingleUserService"
-            android:singleUser="true" android:exported="true">
+             android:singleUser="true"
+             android:exported="true">
         </service>
         <service android:name="ServiceUserTarget">
         </service>
         <receiver android:name="UserTarget">
         </receiver>
-        <service android:name="IsolatedService" android:isolatedProcess="true">
+        <service android:name="IsolatedService"
+             android:isolatedProcess="true">
         </service>
-        <receiver android:name="StartEmpty" android:exported="true">
+        <receiver android:name="StartEmpty"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.example.START_EMPTY" />
+                <action android:name="com.example.START_EMPTY"/>
             </intent-filter>
         </receiver>
-        <service android:name="EmptyService" android:exported="true">
+        <service android:name="EmptyService"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.example.START_EMPTY" />
+                <action android:name="com.example.START_EMPTY"/>
             </intent-filter>
         </service>
         <receiver android:name="SingleUserReceiver"
-            android:singleUser="true" android:exported="true" >
+             android:singleUser="true"
+             android:exported="true">
         </receiver>
         <provider android:name="SingleUserProvider"
-            android:authorities="com.google.android.test.activity.single_user"
-            android:singleUser="true" android:exported="true" />
-        <receiver android:name="TrackTimeReceiver" />
-        <receiver android:name="AlarmSpamReceiver" />
-        <receiver android:name="SlowReceiver" />
+             android:authorities="com.google.android.test.activity.single_user"
+             android:singleUser="true"
+             android:exported="true"/>
+        <receiver android:name="TrackTimeReceiver"/>
+        <receiver android:name="AlarmSpamReceiver"/>
+        <receiver android:name="SlowReceiver"/>
         <activity android:name="DisableScreenshotsActivity"
-                android:label="DisableScreenshots"
-                android:theme="@style/DisableScreenshots">
+             android:label="DisableScreenshots"
+             android:theme="@style/DisableScreenshots"
+             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="CustomSplashscreenActivity"
-            android:label="CustomSplashscreen"
-            android:theme="@style/CustomSplashscreen">
+             android:label="CustomSplashscreen"
+             android:theme="@style/CustomSplashscreen"
+             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>
     </application>
diff --git a/tests/ActivityViewTest/AndroidManifest.xml b/tests/ActivityViewTest/AndroidManifest.xml
index 17eb029..c84b7d9 100644
--- a/tests/ActivityViewTest/AndroidManifest.xml
+++ b/tests/ActivityViewTest/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.test.activityview">
+     package="com.google.android.test.activityview">
     <uses-permission android:name="android.permission.INJECT_EVENTS"/>
     <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
     <uses-permission android:name="android.permission.ACTIVITY_EMBEDDING"/>
@@ -24,8 +24,9 @@
     <uses-sdk android:targetSdkVersion="27"/>
     <application android:label="ActivityViewTest">
         <activity android:name=".ActivityViewMainActivity"
-                  android:label="AV Main"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
+             android:label="AV Main"
+             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.LAUNCHER"/>
@@ -34,33 +35,33 @@
         </activity>
 
         <activity android:name=".ActivityViewActivity"
-                  android:label="AV"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
-                  android:windowSoftInputMode="stateHidden|adjustResize">
+             android:label="AV"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
+             android:windowSoftInputMode="stateHidden|adjustResize">
         </activity>
 
         <activity android:name=".ActivityViewResizeActivity"
-                  android:label="AV Resize"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
-                  android:windowSoftInputMode="stateHidden|adjustResize">
+             android:label="AV Resize"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
+             android:windowSoftInputMode="stateHidden|adjustResize">
         </activity>
 
         <activity android:name=".ActivityViewScrollActivity"
-                  android:label="AV Scroll"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
-                  android:windowSoftInputMode="stateHidden">
+             android:label="AV Scroll"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
+             android:windowSoftInputMode="stateHidden">
         </activity>
 
         <activity android:name=".ActivityViewTestActivity"
-                  android:resizeableActivity="true"
-                  android:theme="@*android:style/Theme.NoTitleBar"
-                  android:exported="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
+             android:resizeableActivity="true"
+             android:theme="@*android:style/Theme.NoTitleBar"
+             android:exported="true"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
         </activity>
 
         <activity android:name=".ActivityViewVisibilityActivity"
-                  android:label="AV Visibility"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
+             android:label="AV Visibility"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density">
         </activity>
     </application>
 </manifest>
diff --git a/tests/AmSlam/AndroidManifest.xml b/tests/AmSlam/AndroidManifest.xml
index 3d39e85..37583a9 100644
--- a/tests/AmSlam/AndroidManifest.xml
+++ b/tests/AmSlam/AndroidManifest.xml
@@ -15,125 +15,324 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="test.amslam">
+     package="test.amslam">
 
-    <application
-        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+    <application android:allowBackup="false"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             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>
 
-        <receiver
-            android:name=".PongReceiver"
-            android:exported="false" />
+        <receiver android:name=".PongReceiver"
+             android:exported="false"/>
 
-        <service android:name=".subreceivers.PingReceiver000" android:exported="false" android:process=":ping000" />
-        <service android:name=".subreceivers.PingReceiver001" android:exported="false" android:process=":ping001" />
-        <service android:name=".subreceivers.PingReceiver002" android:exported="false" android:process=":ping002" />
-        <service android:name=".subreceivers.PingReceiver003" android:exported="false" android:process=":ping003" />
-        <service android:name=".subreceivers.PingReceiver004" android:exported="false" android:process=":ping004" />
-        <service android:name=".subreceivers.PingReceiver005" android:exported="false" android:process=":ping005" />
-        <service android:name=".subreceivers.PingReceiver006" android:exported="false" android:process=":ping006" />
-        <service android:name=".subreceivers.PingReceiver007" android:exported="false" android:process=":ping007" />
-        <service android:name=".subreceivers.PingReceiver008" android:exported="false" android:process=":ping008" />
-        <service android:name=".subreceivers.PingReceiver009" android:exported="false" android:process=":ping009" />
-        <service android:name=".subreceivers.PingReceiver010" android:exported="false" android:process=":ping010" />
-        <service android:name=".subreceivers.PingReceiver011" android:exported="false" android:process=":ping011" />
-        <service android:name=".subreceivers.PingReceiver012" android:exported="false" android:process=":ping012" />
-        <service android:name=".subreceivers.PingReceiver013" android:exported="false" android:process=":ping013" />
-        <service android:name=".subreceivers.PingReceiver014" android:exported="false" android:process=":ping014" />
-        <service android:name=".subreceivers.PingReceiver015" android:exported="false" android:process=":ping015" />
-        <service android:name=".subreceivers.PingReceiver016" android:exported="false" android:process=":ping016" />
-        <service android:name=".subreceivers.PingReceiver017" android:exported="false" android:process=":ping017" />
-        <service android:name=".subreceivers.PingReceiver018" android:exported="false" android:process=":ping018" />
-        <service android:name=".subreceivers.PingReceiver019" android:exported="false" android:process=":ping019" />
-        <service android:name=".subreceivers.PingReceiver020" android:exported="false" android:process=":ping020" />
-        <service android:name=".subreceivers.PingReceiver021" android:exported="false" android:process=":ping021" />
-        <service android:name=".subreceivers.PingReceiver022" android:exported="false" android:process=":ping022" />
-        <service android:name=".subreceivers.PingReceiver023" android:exported="false" android:process=":ping023" />
-        <service android:name=".subreceivers.PingReceiver024" android:exported="false" android:process=":ping024" />
-        <service android:name=".subreceivers.PingReceiver025" android:exported="false" android:process=":ping025" />
-        <service android:name=".subreceivers.PingReceiver026" android:exported="false" android:process=":ping026" />
-        <service android:name=".subreceivers.PingReceiver027" android:exported="false" android:process=":ping027" />
-        <service android:name=".subreceivers.PingReceiver028" android:exported="false" android:process=":ping028" />
-        <service android:name=".subreceivers.PingReceiver029" android:exported="false" android:process=":ping029" />
-        <service android:name=".subreceivers.PingReceiver030" android:exported="false" android:process=":ping030" />
-        <service android:name=".subreceivers.PingReceiver031" android:exported="false" android:process=":ping031" />
-        <service android:name=".subreceivers.PingReceiver032" android:exported="false" android:process=":ping032" />
-        <service android:name=".subreceivers.PingReceiver033" android:exported="false" android:process=":ping033" />
-        <service android:name=".subreceivers.PingReceiver034" android:exported="false" android:process=":ping034" />
-        <service android:name=".subreceivers.PingReceiver035" android:exported="false" android:process=":ping035" />
-        <service android:name=".subreceivers.PingReceiver036" android:exported="false" android:process=":ping036" />
-        <service android:name=".subreceivers.PingReceiver037" android:exported="false" android:process=":ping037" />
-        <service android:name=".subreceivers.PingReceiver038" android:exported="false" android:process=":ping038" />
-        <service android:name=".subreceivers.PingReceiver039" android:exported="false" android:process=":ping039" />
-        <service android:name=".subreceivers.PingReceiver040" android:exported="false" android:process=":ping040" />
-        <service android:name=".subreceivers.PingReceiver041" android:exported="false" android:process=":ping041" />
-        <service android:name=".subreceivers.PingReceiver042" android:exported="false" android:process=":ping042" />
-        <service android:name=".subreceivers.PingReceiver043" android:exported="false" android:process=":ping043" />
-        <service android:name=".subreceivers.PingReceiver044" android:exported="false" android:process=":ping044" />
-        <service android:name=".subreceivers.PingReceiver045" android:exported="false" android:process=":ping045" />
-        <service android:name=".subreceivers.PingReceiver046" android:exported="false" android:process=":ping046" />
-        <service android:name=".subreceivers.PingReceiver047" android:exported="false" android:process=":ping047" />
-        <service android:name=".subreceivers.PingReceiver048" android:exported="false" android:process=":ping048" />
-        <service android:name=".subreceivers.PingReceiver049" android:exported="false" android:process=":ping049" />
-        <service android:name=".subreceivers.PingReceiver050" android:exported="false" android:process=":ping050" />
-        <service android:name=".subreceivers.PingReceiver051" android:exported="false" android:process=":ping051" />
-        <service android:name=".subreceivers.PingReceiver052" android:exported="false" android:process=":ping052" />
-        <service android:name=".subreceivers.PingReceiver053" android:exported="false" android:process=":ping053" />
-        <service android:name=".subreceivers.PingReceiver054" android:exported="false" android:process=":ping054" />
-        <service android:name=".subreceivers.PingReceiver055" android:exported="false" android:process=":ping055" />
-        <service android:name=".subreceivers.PingReceiver056" android:exported="false" android:process=":ping056" />
-        <service android:name=".subreceivers.PingReceiver057" android:exported="false" android:process=":ping057" />
-        <service android:name=".subreceivers.PingReceiver058" android:exported="false" android:process=":ping058" />
-        <service android:name=".subreceivers.PingReceiver059" android:exported="false" android:process=":ping059" />
-        <service android:name=".subreceivers.PingReceiver060" android:exported="false" android:process=":ping060" />
-        <service android:name=".subreceivers.PingReceiver061" android:exported="false" android:process=":ping061" />
-        <service android:name=".subreceivers.PingReceiver062" android:exported="false" android:process=":ping062" />
-        <service android:name=".subreceivers.PingReceiver063" android:exported="false" android:process=":ping063" />
-        <service android:name=".subreceivers.PingReceiver064" android:exported="false" android:process=":ping064" />
-        <service android:name=".subreceivers.PingReceiver065" android:exported="false" android:process=":ping065" />
-        <service android:name=".subreceivers.PingReceiver066" android:exported="false" android:process=":ping066" />
-        <service android:name=".subreceivers.PingReceiver067" android:exported="false" android:process=":ping067" />
-        <service android:name=".subreceivers.PingReceiver068" android:exported="false" android:process=":ping068" />
-        <service android:name=".subreceivers.PingReceiver069" android:exported="false" android:process=":ping069" />
-        <service android:name=".subreceivers.PingReceiver070" android:exported="false" android:process=":ping070" />
-        <service android:name=".subreceivers.PingReceiver071" android:exported="false" android:process=":ping071" />
-        <service android:name=".subreceivers.PingReceiver072" android:exported="false" android:process=":ping072" />
-        <service android:name=".subreceivers.PingReceiver073" android:exported="false" android:process=":ping073" />
-        <service android:name=".subreceivers.PingReceiver074" android:exported="false" android:process=":ping074" />
-        <service android:name=".subreceivers.PingReceiver075" android:exported="false" android:process=":ping075" />
-        <service android:name=".subreceivers.PingReceiver076" android:exported="false" android:process=":ping076" />
-        <service android:name=".subreceivers.PingReceiver077" android:exported="false" android:process=":ping077" />
-        <service android:name=".subreceivers.PingReceiver078" android:exported="false" android:process=":ping078" />
-        <service android:name=".subreceivers.PingReceiver079" android:exported="false" android:process=":ping079" />
-        <service android:name=".subreceivers.PingReceiver080" android:exported="false" android:process=":ping080" />
-        <service android:name=".subreceivers.PingReceiver081" android:exported="false" android:process=":ping081" />
-        <service android:name=".subreceivers.PingReceiver082" android:exported="false" android:process=":ping082" />
-        <service android:name=".subreceivers.PingReceiver083" android:exported="false" android:process=":ping083" />
-        <service android:name=".subreceivers.PingReceiver084" android:exported="false" android:process=":ping084" />
-        <service android:name=".subreceivers.PingReceiver085" android:exported="false" android:process=":ping085" />
-        <service android:name=".subreceivers.PingReceiver086" android:exported="false" android:process=":ping086" />
-        <service android:name=".subreceivers.PingReceiver087" android:exported="false" android:process=":ping087" />
-        <service android:name=".subreceivers.PingReceiver088" android:exported="false" android:process=":ping088" />
-        <service android:name=".subreceivers.PingReceiver089" android:exported="false" android:process=":ping089" />
-        <service android:name=".subreceivers.PingReceiver090" android:exported="false" android:process=":ping090" />
-        <service android:name=".subreceivers.PingReceiver091" android:exported="false" android:process=":ping091" />
-        <service android:name=".subreceivers.PingReceiver092" android:exported="false" android:process=":ping092" />
-        <service android:name=".subreceivers.PingReceiver093" android:exported="false" android:process=":ping093" />
-        <service android:name=".subreceivers.PingReceiver094" android:exported="false" android:process=":ping094" />
-        <service android:name=".subreceivers.PingReceiver095" android:exported="false" android:process=":ping095" />
-        <service android:name=".subreceivers.PingReceiver096" android:exported="false" android:process=":ping096" />
-        <service android:name=".subreceivers.PingReceiver097" android:exported="false" android:process=":ping097" />
-        <service android:name=".subreceivers.PingReceiver098" android:exported="false" android:process=":ping098" />
-        <service android:name=".subreceivers.PingReceiver099" android:exported="false" android:process=":ping099" />
+        <service android:name=".subreceivers.PingReceiver000"
+             android:exported="false"
+             android:process=":ping000"/>
+        <service android:name=".subreceivers.PingReceiver001"
+             android:exported="false"
+             android:process=":ping001"/>
+        <service android:name=".subreceivers.PingReceiver002"
+             android:exported="false"
+             android:process=":ping002"/>
+        <service android:name=".subreceivers.PingReceiver003"
+             android:exported="false"
+             android:process=":ping003"/>
+        <service android:name=".subreceivers.PingReceiver004"
+             android:exported="false"
+             android:process=":ping004"/>
+        <service android:name=".subreceivers.PingReceiver005"
+             android:exported="false"
+             android:process=":ping005"/>
+        <service android:name=".subreceivers.PingReceiver006"
+             android:exported="false"
+             android:process=":ping006"/>
+        <service android:name=".subreceivers.PingReceiver007"
+             android:exported="false"
+             android:process=":ping007"/>
+        <service android:name=".subreceivers.PingReceiver008"
+             android:exported="false"
+             android:process=":ping008"/>
+        <service android:name=".subreceivers.PingReceiver009"
+             android:exported="false"
+             android:process=":ping009"/>
+        <service android:name=".subreceivers.PingReceiver010"
+             android:exported="false"
+             android:process=":ping010"/>
+        <service android:name=".subreceivers.PingReceiver011"
+             android:exported="false"
+             android:process=":ping011"/>
+        <service android:name=".subreceivers.PingReceiver012"
+             android:exported="false"
+             android:process=":ping012"/>
+        <service android:name=".subreceivers.PingReceiver013"
+             android:exported="false"
+             android:process=":ping013"/>
+        <service android:name=".subreceivers.PingReceiver014"
+             android:exported="false"
+             android:process=":ping014"/>
+        <service android:name=".subreceivers.PingReceiver015"
+             android:exported="false"
+             android:process=":ping015"/>
+        <service android:name=".subreceivers.PingReceiver016"
+             android:exported="false"
+             android:process=":ping016"/>
+        <service android:name=".subreceivers.PingReceiver017"
+             android:exported="false"
+             android:process=":ping017"/>
+        <service android:name=".subreceivers.PingReceiver018"
+             android:exported="false"
+             android:process=":ping018"/>
+        <service android:name=".subreceivers.PingReceiver019"
+             android:exported="false"
+             android:process=":ping019"/>
+        <service android:name=".subreceivers.PingReceiver020"
+             android:exported="false"
+             android:process=":ping020"/>
+        <service android:name=".subreceivers.PingReceiver021"
+             android:exported="false"
+             android:process=":ping021"/>
+        <service android:name=".subreceivers.PingReceiver022"
+             android:exported="false"
+             android:process=":ping022"/>
+        <service android:name=".subreceivers.PingReceiver023"
+             android:exported="false"
+             android:process=":ping023"/>
+        <service android:name=".subreceivers.PingReceiver024"
+             android:exported="false"
+             android:process=":ping024"/>
+        <service android:name=".subreceivers.PingReceiver025"
+             android:exported="false"
+             android:process=":ping025"/>
+        <service android:name=".subreceivers.PingReceiver026"
+             android:exported="false"
+             android:process=":ping026"/>
+        <service android:name=".subreceivers.PingReceiver027"
+             android:exported="false"
+             android:process=":ping027"/>
+        <service android:name=".subreceivers.PingReceiver028"
+             android:exported="false"
+             android:process=":ping028"/>
+        <service android:name=".subreceivers.PingReceiver029"
+             android:exported="false"
+             android:process=":ping029"/>
+        <service android:name=".subreceivers.PingReceiver030"
+             android:exported="false"
+             android:process=":ping030"/>
+        <service android:name=".subreceivers.PingReceiver031"
+             android:exported="false"
+             android:process=":ping031"/>
+        <service android:name=".subreceivers.PingReceiver032"
+             android:exported="false"
+             android:process=":ping032"/>
+        <service android:name=".subreceivers.PingReceiver033"
+             android:exported="false"
+             android:process=":ping033"/>
+        <service android:name=".subreceivers.PingReceiver034"
+             android:exported="false"
+             android:process=":ping034"/>
+        <service android:name=".subreceivers.PingReceiver035"
+             android:exported="false"
+             android:process=":ping035"/>
+        <service android:name=".subreceivers.PingReceiver036"
+             android:exported="false"
+             android:process=":ping036"/>
+        <service android:name=".subreceivers.PingReceiver037"
+             android:exported="false"
+             android:process=":ping037"/>
+        <service android:name=".subreceivers.PingReceiver038"
+             android:exported="false"
+             android:process=":ping038"/>
+        <service android:name=".subreceivers.PingReceiver039"
+             android:exported="false"
+             android:process=":ping039"/>
+        <service android:name=".subreceivers.PingReceiver040"
+             android:exported="false"
+             android:process=":ping040"/>
+        <service android:name=".subreceivers.PingReceiver041"
+             android:exported="false"
+             android:process=":ping041"/>
+        <service android:name=".subreceivers.PingReceiver042"
+             android:exported="false"
+             android:process=":ping042"/>
+        <service android:name=".subreceivers.PingReceiver043"
+             android:exported="false"
+             android:process=":ping043"/>
+        <service android:name=".subreceivers.PingReceiver044"
+             android:exported="false"
+             android:process=":ping044"/>
+        <service android:name=".subreceivers.PingReceiver045"
+             android:exported="false"
+             android:process=":ping045"/>
+        <service android:name=".subreceivers.PingReceiver046"
+             android:exported="false"
+             android:process=":ping046"/>
+        <service android:name=".subreceivers.PingReceiver047"
+             android:exported="false"
+             android:process=":ping047"/>
+        <service android:name=".subreceivers.PingReceiver048"
+             android:exported="false"
+             android:process=":ping048"/>
+        <service android:name=".subreceivers.PingReceiver049"
+             android:exported="false"
+             android:process=":ping049"/>
+        <service android:name=".subreceivers.PingReceiver050"
+             android:exported="false"
+             android:process=":ping050"/>
+        <service android:name=".subreceivers.PingReceiver051"
+             android:exported="false"
+             android:process=":ping051"/>
+        <service android:name=".subreceivers.PingReceiver052"
+             android:exported="false"
+             android:process=":ping052"/>
+        <service android:name=".subreceivers.PingReceiver053"
+             android:exported="false"
+             android:process=":ping053"/>
+        <service android:name=".subreceivers.PingReceiver054"
+             android:exported="false"
+             android:process=":ping054"/>
+        <service android:name=".subreceivers.PingReceiver055"
+             android:exported="false"
+             android:process=":ping055"/>
+        <service android:name=".subreceivers.PingReceiver056"
+             android:exported="false"
+             android:process=":ping056"/>
+        <service android:name=".subreceivers.PingReceiver057"
+             android:exported="false"
+             android:process=":ping057"/>
+        <service android:name=".subreceivers.PingReceiver058"
+             android:exported="false"
+             android:process=":ping058"/>
+        <service android:name=".subreceivers.PingReceiver059"
+             android:exported="false"
+             android:process=":ping059"/>
+        <service android:name=".subreceivers.PingReceiver060"
+             android:exported="false"
+             android:process=":ping060"/>
+        <service android:name=".subreceivers.PingReceiver061"
+             android:exported="false"
+             android:process=":ping061"/>
+        <service android:name=".subreceivers.PingReceiver062"
+             android:exported="false"
+             android:process=":ping062"/>
+        <service android:name=".subreceivers.PingReceiver063"
+             android:exported="false"
+             android:process=":ping063"/>
+        <service android:name=".subreceivers.PingReceiver064"
+             android:exported="false"
+             android:process=":ping064"/>
+        <service android:name=".subreceivers.PingReceiver065"
+             android:exported="false"
+             android:process=":ping065"/>
+        <service android:name=".subreceivers.PingReceiver066"
+             android:exported="false"
+             android:process=":ping066"/>
+        <service android:name=".subreceivers.PingReceiver067"
+             android:exported="false"
+             android:process=":ping067"/>
+        <service android:name=".subreceivers.PingReceiver068"
+             android:exported="false"
+             android:process=":ping068"/>
+        <service android:name=".subreceivers.PingReceiver069"
+             android:exported="false"
+             android:process=":ping069"/>
+        <service android:name=".subreceivers.PingReceiver070"
+             android:exported="false"
+             android:process=":ping070"/>
+        <service android:name=".subreceivers.PingReceiver071"
+             android:exported="false"
+             android:process=":ping071"/>
+        <service android:name=".subreceivers.PingReceiver072"
+             android:exported="false"
+             android:process=":ping072"/>
+        <service android:name=".subreceivers.PingReceiver073"
+             android:exported="false"
+             android:process=":ping073"/>
+        <service android:name=".subreceivers.PingReceiver074"
+             android:exported="false"
+             android:process=":ping074"/>
+        <service android:name=".subreceivers.PingReceiver075"
+             android:exported="false"
+             android:process=":ping075"/>
+        <service android:name=".subreceivers.PingReceiver076"
+             android:exported="false"
+             android:process=":ping076"/>
+        <service android:name=".subreceivers.PingReceiver077"
+             android:exported="false"
+             android:process=":ping077"/>
+        <service android:name=".subreceivers.PingReceiver078"
+             android:exported="false"
+             android:process=":ping078"/>
+        <service android:name=".subreceivers.PingReceiver079"
+             android:exported="false"
+             android:process=":ping079"/>
+        <service android:name=".subreceivers.PingReceiver080"
+             android:exported="false"
+             android:process=":ping080"/>
+        <service android:name=".subreceivers.PingReceiver081"
+             android:exported="false"
+             android:process=":ping081"/>
+        <service android:name=".subreceivers.PingReceiver082"
+             android:exported="false"
+             android:process=":ping082"/>
+        <service android:name=".subreceivers.PingReceiver083"
+             android:exported="false"
+             android:process=":ping083"/>
+        <service android:name=".subreceivers.PingReceiver084"
+             android:exported="false"
+             android:process=":ping084"/>
+        <service android:name=".subreceivers.PingReceiver085"
+             android:exported="false"
+             android:process=":ping085"/>
+        <service android:name=".subreceivers.PingReceiver086"
+             android:exported="false"
+             android:process=":ping086"/>
+        <service android:name=".subreceivers.PingReceiver087"
+             android:exported="false"
+             android:process=":ping087"/>
+        <service android:name=".subreceivers.PingReceiver088"
+             android:exported="false"
+             android:process=":ping088"/>
+        <service android:name=".subreceivers.PingReceiver089"
+             android:exported="false"
+             android:process=":ping089"/>
+        <service android:name=".subreceivers.PingReceiver090"
+             android:exported="false"
+             android:process=":ping090"/>
+        <service android:name=".subreceivers.PingReceiver091"
+             android:exported="false"
+             android:process=":ping091"/>
+        <service android:name=".subreceivers.PingReceiver092"
+             android:exported="false"
+             android:process=":ping092"/>
+        <service android:name=".subreceivers.PingReceiver093"
+             android:exported="false"
+             android:process=":ping093"/>
+        <service android:name=".subreceivers.PingReceiver094"
+             android:exported="false"
+             android:process=":ping094"/>
+        <service android:name=".subreceivers.PingReceiver095"
+             android:exported="false"
+             android:process=":ping095"/>
+        <service android:name=".subreceivers.PingReceiver096"
+             android:exported="false"
+             android:process=":ping096"/>
+        <service android:name=".subreceivers.PingReceiver097"
+             android:exported="false"
+             android:process=":ping097"/>
+        <service android:name=".subreceivers.PingReceiver098"
+             android:exported="false"
+             android:process=":ping098"/>
+        <service android:name=".subreceivers.PingReceiver099"
+             android:exported="false"
+             android:process=":ping099"/>
     </application>
 
 </manifest>
diff --git a/tests/AppResourcesLoaders/AndroidManifest.xml b/tests/AppResourcesLoaders/AndroidManifest.xml
index cb403b9..6101100 100644
--- a/tests/AppResourcesLoaders/AndroidManifest.xml
+++ b/tests/AppResourcesLoaders/AndroidManifest.xml
@@ -16,16 +16,17 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.example.loaders">
+     package="com.android.example.loaders">
     <application android:label="AppResourcesLoaders"
-                 android:name=".LoadersApplication">
-        <activity android:name=".LoaderActivity">
+         android:name=".LoadersApplication">
+        <activity android:name=".LoaderActivity"
+             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=".LoaderActivityIsolated"
-                  android:process="com.android.phone" />
+             android:process="com.android.phone"/>
     </application>
 </manifest>
diff --git a/tests/Assist/AndroidManifest.xml b/tests/Assist/AndroidManifest.xml
index 9d4c4ad..2f6f50b 100644
--- a/tests/Assist/AndroidManifest.xml
+++ b/tests/Assist/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -15,35 +16,34 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.test.assist">
+     package="com.android.test.assist">
 
     <application>
         <service android:name="AssistInteractionService"
-                android:label="Test Assist Interaction Service"
-                android:permission="android.permission.BIND_VOICE_INTERACTION"
-                android:process=":interactor">
+             android:label="Test Assist Interaction Service"
+             android:permission="android.permission.BIND_VOICE_INTERACTION"
+             android:process=":interactor"
+             android:exported="true">
             <meta-data android:name="android.voice_interaction"
-                       android:resource="@xml/interaction_service" />
+                 android:resource="@xml/interaction_service"/>
             <intent-filter>
-                <action android:name="android.service.voice.VoiceInteractionService" />
+                <action android:name="android.service.voice.VoiceInteractionService"/>
             </intent-filter>
-            <meta-data
-                android:name="com.android.systemui.action_assist_icon"
-                android:resource="@drawable/assistant" />
-            <meta-data
-                android:name="com.android.keyguard.layout"
-                android:resource="@layout/keyguard_preview" />
+            <meta-data android:name="com.android.systemui.action_assist_icon"
+                 android:resource="@drawable/assistant"/>
+            <meta-data android:name="com.android.keyguard.layout"
+                 android:resource="@layout/keyguard_preview"/>
         </service>
         <service android:name="AssistInteractionSessionService"
-                android:permission="android.permission.BIND_VOICE_INTERACTION"
-                android:process=":session">
+             android:permission="android.permission.BIND_VOICE_INTERACTION"
+             android:process=":session">
         </service>
         <activity android:name=".AboveKeyguardActivity"
-                  android:label="Test Above Keyguard Activity"
-                  android:theme="@android:style/Theme.NoTitleBar"
-                  android:excludeFromRecents="true"
-                  android:launchMode="singleTask"
-                  android:exported="false" >
+             android:label="Test Above Keyguard Activity"
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:excludeFromRecents="true"
+             android:launchMode="singleTask"
+             android:exported="false">
         </activity>
     </application>
 </manifest>
diff --git a/tests/BandwidthTests/AndroidManifest.xml b/tests/BandwidthTests/AndroidManifest.xml
index 19f38ca..72bdd14 100644
--- a/tests/BandwidthTests/AndroidManifest.xml
+++ b/tests/BandwidthTests/AndroidManifest.xml
@@ -13,19 +13,22 @@
      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.android.tests.bandwidthenforcement">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     package="com.android.tests.bandwidthenforcement">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application>
-        <activity android:name=".BandwidthEnforcementTestActivity">
+        <activity android:name=".BandwidthEnforcementTestActivity"
+             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>
         <!-- adb shell am startservice -n com.android.tests.bandwidthenforcement/.BandwidthEnforcementTestService -->
-        <service android:name=".BandwidthEnforcementTestService" android:exported="true" />
+        <service android:name=".BandwidthEnforcementTestService"
+             android:exported="true"/>
     </application>
 </manifest>
diff --git a/tests/BatteryWaster/AndroidManifest.xml b/tests/BatteryWaster/AndroidManifest.xml
index 0d7f007..5910c18 100644
--- a/tests/BatteryWaster/AndroidManifest.xml
+++ b/tests/BatteryWaster/AndroidManifest.xml
@@ -1,14 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.batterywaster">
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+     package="com.android.batterywaster">
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <application>
-        <activity android:name="BatteryWaster" android:label="Battery Waster">
+        <activity android:name="BatteryWaster"
+             android:label="Battery Waster"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/BiDiTests/AndroidManifest.xml b/tests/BiDiTests/AndroidManifest.xml
index 4aead814..cea5d68 100644
--- a/tests/BiDiTests/AndroidManifest.xml
+++ b/tests/BiDiTests/AndroidManifest.xml
@@ -15,23 +15,24 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.bidi"
-    android:versionCode="1"
-    android:versionName="1.0">
+     package="com.android.bidi"
+     android:versionCode="1"
+     android:versionName="1.0">
 
     <application android:label="BiDiTests"
-                 android:hardwareAccelerated="true"
-                 android:supportsRtl="true" >
+         android:hardwareAccelerated="true"
+         android:supportsRtl="true">
 
         <activity android:name=".BiDiTestActivity"
-            android:windowSoftInputMode="stateAlwaysHidden">
+             android:windowSoftInputMode="stateAlwaysHidden"
+             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>
 
     </application>
     <uses-sdk android:minSdkVersion="10"
-              android:targetSdkVersion="10"/>
+         android:targetSdkVersion="10"/>
 </manifest>
diff --git a/tests/BrowserPowerTest/AndroidManifest.xml b/tests/BrowserPowerTest/AndroidManifest.xml
index 43eeaad..003e47e 100644
--- a/tests/BrowserPowerTest/AndroidManifest.xml
+++ b/tests/BrowserPowerTest/AndroidManifest.xml
@@ -13,34 +13,35 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.browserpowertest">
+     package="com.android.browserpowertest">
 
     <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
+                 this package needs to link against the android.test library,
+                 which is needed when building test cases. -->
     <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="PowerTestActivity" android:label="Power">
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name="PowerTestActivity"
+             android:label="Power"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.TEST"/>
             </intent-filter>
         </activity>
     </application>
     <!--
-    This declares that this app uses the instrumentation test runner targeting
-    the package of browserpowertest. To run the tests use the command:
-    "adb shell am instrument -w com.android.browserpowertest/.PowerTestRunner"
-    -->
+            This declares that this app uses the instrumentation test runner targeting
+            the package of browserpowertest. To run the tests use the command:
+            "adb shell am instrument -w com.android.browserpowertest/.PowerTestRunner"
+            -->
     <instrumentation android:name=".PowerTestRunner"
-        android:targetPackage="com.android.browserpowertest"
-        android:label="Test runner for Browser Power Tests."
-    />
+         android:targetPackage="com.android.browserpowertest"
+         android:label="Test runner for Browser Power Tests."/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_SDCARD" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_SDCARD"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>
diff --git a/tests/Camera2Tests/CameraToo/AndroidManifest.xml b/tests/Camera2Tests/CameraToo/AndroidManifest.xml
index a92b5d8..2c1b4cb 100644
--- a/tests/Camera2Tests/CameraToo/AndroidManifest.xml
+++ b/tests/Camera2Tests/CameraToo/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
     Copyright (C) 2014 The Android Open Source Project
 
@@ -17,16 +16,16 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.camera2.cameratoo">
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     package="com.example.android.camera2.cameratoo">
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application android:label="CameraToo">
-        <activity
-            android:name=".CameraTooActivity"
-            android:screenOrientation="portrait">
+        <activity android:name=".CameraTooActivity"
+             android:screenOrientation="portrait"
+             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>
     </application>
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/AndroidManifest.xml b/tests/Camera2Tests/SmartCamera/SimpleCamera/AndroidManifest.xml
index 0681868..35a8650 100644
--- a/tests/Camera2Tests/SmartCamera/SimpleCamera/AndroidManifest.xml
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/AndroidManifest.xml
@@ -13,24 +13,27 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:versionCode="1"
-      android:versionName="1.0"
-      package="androidx.media.filterfw.samples.simplecamera">
-    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="19"/>
-    <uses-permission android:name="android.permission.CAMERA" />
+     android:versionCode="1"
+     android:versionName="1.0"
+     package="androidx.media.filterfw.samples.simplecamera">
+    <uses-sdk android:minSdkVersion="18"
+         android:targetSdkVersion="19"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application android:label="Smart Camera"
-                  android:debuggable="true">
+         android:debuggable="true">
     <uses-library android:name="com.google.android.media.effects"
-                  android:required="false" />
+         android:required="false"/>
 
         <activity android:name=".SmartCamera"
-                  android:label="Smart Camera"
-                  android:screenOrientation="portrait">
+             android:label="Smart Camera"
+             android:screenOrientation="portrait"
+             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>
 
diff --git a/tests/CameraPrewarmTest/AndroidManifest.xml b/tests/CameraPrewarmTest/AndroidManifest.xml
index 11b2686..7fafd33 100644
--- a/tests/CameraPrewarmTest/AndroidManifest.xml
+++ b/tests/CameraPrewarmTest/AndroidManifest.xml
@@ -16,35 +16,35 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.google.android.test.cameraprewarm">
+     package="com.google.android.test.cameraprewarm">
     <application android:label="@string/activity_title">
 
         <activity android:name=".CameraActivity"
-                android:theme="@android:style/Theme.NoTitleBar">
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.media.action.STILL_IMAGE_CAMERA"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-            <meta-data
-                android:name="android.media.still_image_camera_preview_service"
-                android:value="com.google.android.test.cameraprewarm.PrewarmService">
+            <meta-data android:name="android.media.still_image_camera_preview_service"
+                 android:value="com.google.android.test.cameraprewarm.PrewarmService">
             </meta-data>
         </activity>
 
         <activity android:name=".SecureCameraActivity"
-                android:theme="@android:style/Theme.NoTitleBar">
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-            <meta-data
-                android:name="android.media.still_image_camera_preview_service"
-                android:value="com.google.android.test.cameraprewarm.PrewarmService">
+            <meta-data android:name="android.media.still_image_camera_preview_service"
+                 android:value="com.google.android.test.cameraprewarm.PrewarmService">
             </meta-data>
         </activity>
 
         <service android:name=".PrewarmService"
-            android:exported="true">
+             android:exported="true">
         </service>
 
     </application>
diff --git a/tests/CanvasCompare/AndroidManifest.xml b/tests/CanvasCompare/AndroidManifest.xml
index b55e290..2734e7f 100644
--- a/tests/CanvasCompare/AndroidManifest.xml
+++ b/tests/CanvasCompare/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,37 +13,36 @@
      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.android.test.hwuicompare" >
 
-    <uses-permission android:name="android.permission.INTERNET" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.test.hwuicompare">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-    <application
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.Holo.Light.NoActionBar">
-        <activity
-            android:name="AutomaticActivity"
-            android:label="CanvasAutoCompare" >
+    <application android:label="@string/app_name"
+         android:theme="@android:style/Theme.Holo.Light.NoActionBar">
+        <activity android:name="AutomaticActivity"
+             android:label="CanvasAutoCompare"
+             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="ManualActivity"
-            android:label="CanvasManualCompare" >
+        <activity android:name="ManualActivity"
+             android:label="CanvasManualCompare"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.test.hwuicompare"
-        android:label="HW/SW Canvas comparison tool."/>
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+         android:targetPackage="com.android.test.hwuicompare"
+         android:label="HW/SW Canvas comparison tool."/>
 
 </manifest>
diff --git a/tests/DpiTest/AndroidManifest.xml b/tests/DpiTest/AndroidManifest.xml
index a4d8c79..cf4c21d 100644
--- a/tests/DpiTest/AndroidManifest.xml
+++ b/tests/DpiTest/AndroidManifest.xml
@@ -15,26 +15,34 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.dpi">
-    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="3" />
-    <supports-screens android:smallScreens="true" />
+     package="com.google.android.test.dpi">
+    <uses-sdk android:minSdkVersion="3"
+         android:targetSdkVersion="3"/>
+    <supports-screens android:smallScreens="true"/>
     <compatible-screens>
-        <screen android:screenSize="small" android:screenDensity="ldpi" />
-        <screen android:screenSize="small" android:screenDensity="xhdpi" />
-        <screen android:screenSize="large" android:screenDensity="hdpi" />
-        <screen android:screenSize="xlarge" android:screenDensity="mdpi" />
+        <screen android:screenSize="small"
+             android:screenDensity="ldpi"/>
+        <screen android:screenSize="small"
+             android:screenDensity="xhdpi"/>
+        <screen android:screenSize="large"
+             android:screenDensity="hdpi"/>
+        <screen android:screenSize="xlarge"
+             android:screenDensity="mdpi"/>
     </compatible-screens>
     <application android:label="DpiTest">
-        <activity android:name="DpiTestActivity">
+        <activity android:name="DpiTestActivity"
+             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="DpiTestNoCompatActivity" android:label="DpiTestNoCompat">
+        <activity android:name="DpiTestNoCompatActivity"
+             android:label="DpiTestNoCompat"
+             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>
     </application>
diff --git a/tests/FeatureSplit/base/AndroidManifest.xml b/tests/FeatureSplit/base/AndroidManifest.xml
index e82b3b9..1bc07ef 100644
--- a/tests/FeatureSplit/base/AndroidManifest.xml
+++ b/tests/FeatureSplit/base/AndroidManifest.xml
@@ -15,15 +15,17 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.test.split.feature">
+     package="com.android.test.split.feature">
 
-    <uses-sdk android:minSdkVersion="21" />
+    <uses-sdk android:minSdkVersion="21"/>
 
     <application android:label="@string/app_title">
-        <activity android:name=".ActivityMain" android:label="Feature Base">
+        <activity android:name=".ActivityMain"
+             android:label="Feature Base"
+             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>
     </application>
diff --git a/tests/FeatureSplit/feature1/AndroidManifest.xml b/tests/FeatureSplit/feature1/AndroidManifest.xml
index 086c2c3..4581a85 100644
--- a/tests/FeatureSplit/feature1/AndroidManifest.xml
+++ b/tests/FeatureSplit/feature1/AndroidManifest.xml
@@ -15,17 +15,19 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.test.split.feature"
-    featureSplit="feature1">
+     package="com.android.test.split.feature"
+     featureSplit="feature1">
 
-    <uses-sdk android:minSdkVersion="21" />
-    <uses-split android:name="feature2" />
+    <uses-sdk android:minSdkVersion="21"/>
+    <uses-split android:name="feature2"/>
 
     <application>
-        <activity android:name=".one.One" android:label="Feature One">
+        <activity android:name=".one.One"
+             android:label="Feature One"
+             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>
     </application>
diff --git a/tests/FixVibrateSetting/AndroidManifest.xml b/tests/FixVibrateSetting/AndroidManifest.xml
index 007d682..c2d5918 100644
--- a/tests/FixVibrateSetting/AndroidManifest.xml
+++ b/tests/FixVibrateSetting/AndroidManifest.xml
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.fixvibratesetting">
-    <uses-permission android:name="android.permission.VIBRATE" />
+     package="com.android.fixvibratesetting">
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application>
-        <activity android:name="FixVibrateSetting" android:label="@string/app_label">
+        <activity android:name="FixVibrateSetting"
+             android:label="@string/app_label"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
index 0fe9682..7770c73 100644
--- a/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
+++ b/tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml
@@ -14,60 +14,62 @@
      limitations under the License.
 -->
 
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.server.wm.flicker.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.server.wm.flicker.testapp">
 
-    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="27"/>
-    <application
-        android:allowBackup="false"
-        android:supportsRtl="true">
+    <uses-sdk android:minSdkVersion="17"
+         android:targetSdkVersion="27"/>
+    <application android:allowBackup="false"
+         android:supportsRtl="true">
         <activity android:name=".SimpleActivity"
-                  android:taskAffinity="com.android.server.wm.flicker.testapp.SimpleActivity"
-                  android:label="SimpleApp">
+             android:taskAffinity="com.android.server.wm.flicker.testapp.SimpleActivity"
+             android:label="SimpleApp"
+             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=".ImeActivity"
-                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivity"
-                  android:label="ImeApp">
+             android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivity"
+             android:label="ImeApp"
+             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=".ImeActivityAutoFocus"
-                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivityAutoFocus"
-                  android:windowSoftInputMode="stateVisible"
-                  android:label="ImeAppAutoFocus">
+             android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivityAutoFocus"
+             android:windowSoftInputMode="stateVisible"
+             android:label="ImeAppAutoFocus"
+             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=".PipActivity"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  android:configChanges=
-                      "screenSize|smallestScreenSize|screenLayout|orientation"
-                  android:taskAffinity="com.android.server.wm.flicker.testapp.PipActivity"
-                  android:label="PipApp">
+             android:resizeableActivity="true"
+             android:supportsPictureInPicture="true"
+             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+             android:taskAffinity="com.android.server.wm.flicker.testapp.PipActivity"
+             android:label="PipApp"
+             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=".SeamlessRotationActivity"
-                  android:taskAffinity=
-                      "com.android.server.wm.flicker.testapp.SeamlessRotationActivity"
-                  android:configChanges="orientation|screenSize"
-                  android:label="SeamlessApp">
+             android:taskAffinity="com.android.server.wm.flicker.testapp.SeamlessRotationActivity"
+             android:configChanges="orientation|screenSize"
+             android:label="SeamlessApp"
+             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/FrameworkPerf/AndroidManifest.xml b/tests/FrameworkPerf/AndroidManifest.xml
index 4fd2043..07e775a 100644
--- a/tests/FrameworkPerf/AndroidManifest.xml
+++ b/tests/FrameworkPerf/AndroidManifest.xml
@@ -1,30 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.frameworkperf">
+     package="com.android.frameworkperf">
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-sdk android:minSdkVersion="5" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-sdk android:minSdkVersion="5"/>
 
     <application android:hardwareAccelerated="false">
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="FrameworkPerfActivity" android:label="Framework Perf">
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name="FrameworkPerfActivity"
+             android:label="Framework Perf"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <service android:name="SchedulerService"
-                 android:foregroundServiceType="dataSync|mediaPlayback|phoneCall|location|connectedDevice">
+             android:foregroundServiceType="dataSync|mediaPlayback|phoneCall|location|connectedDevice">
         </service>
-        <service android:name="TestService" android:process=":test">
+        <service android:name="TestService"
+             android:process=":test">
         </service>
         <service android:name="LocalTestService">
         </service>
-        <receiver android:name="Receiver" android:exported="true">
+        <receiver android:name="Receiver"
+             android:exported="true">
         </receiver>
     </application>
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.frameworkperf"
-        android:label="Framework Perf Runner"
-    />
+         android:targetPackage="com.android.frameworkperf"
+         android:label="Framework Perf Runner"/>
 </manifest>
diff --git a/tests/GamePerformance/AndroidManifest.xml b/tests/GamePerformance/AndroidManifest.xml
index 2ff7fa6..8e6054b 100644
--- a/tests/GamePerformance/AndroidManifest.xml
+++ b/tests/GamePerformance/AndroidManifest.xml
@@ -16,28 +16,30 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.gameperformance"
-    android:versionCode="3"
-    android:versionName="3.0" >
+     package="android.gameperformance"
+     android:versionCode="3"
+     android:versionName="3.0">
     <uses-sdk android:minSdkVersion="25"/>
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <uses-feature android:glEsVersion="0x00020000"
+         android:required="true"/>
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <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_EXTERNAL_STORAGE"/>
     <application android:theme="@style/noeffects">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
         <activity android:name="android.gameperformance.GamePerformanceActivity"
-                  android:screenOrientation="landscape" >
+             android:screenOrientation="landscape"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <!--  self-instrumenting test package. -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.gameperformance">
+         android:targetPackage="android.gameperformance">
     </instrumentation>
 </manifest>
diff --git a/tests/GridLayoutTest/AndroidManifest.xml b/tests/GridLayoutTest/AndroidManifest.xml
index 677220d..6fdcda3 100644
--- a/tests/GridLayoutTest/AndroidManifest.xml
+++ b/tests/GridLayoutTest/AndroidManifest.xml
@@ -15,76 +15,96 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.test.layout">
+     package="com.android.test.layout">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-sdk android:minSdkVersion="11"/>
 
     <application>
-        <activity android:name="Activity0" android:label="Activity0">
+        <activity android:name="Activity0"
+             android:label="Activity0"
+             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="Activity1" android:label="Activity1">
+        <activity android:name="Activity1"
+             android:label="Activity1"
+             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="Activity4" android:label="Activity4">
+        <activity android:name="Activity4"
+             android:label="Activity4"
+             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="Activity5" android:label="Activity5">
+        <activity android:name="Activity5"
+             android:label="Activity5"
+             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="Activity6" android:label="Activity6">
+        <activity android:name="Activity6"
+             android:label="Activity6"
+             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="Activity7" android:label="Activity7">
+        <activity android:name="Activity7"
+             android:label="Activity7"
+             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="AlignmentTest" android:label="AlignmentTest">
+        <activity android:name="AlignmentTest"
+             android:label="AlignmentTest"
+             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="LinearLayoutTest" android:label="LinearLayoutTest">
+        <activity android:name="LinearLayoutTest"
+             android:label="LinearLayoutTest"
+             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="GridLayoutTest" android:label="GridLayoutTest">
+        <activity android:name="GridLayoutTest"
+             android:label="GridLayoutTest"
+             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="LayoutInsetsTest" android:label="LayoutInsetsTest">
+        <activity android:name="LayoutInsetsTest"
+             android:label="LayoutInsetsTest"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/HierarchyViewerTest/AndroidManifest.xml b/tests/HierarchyViewerTest/AndroidManifest.xml
index 65f2fd3..f4414b0 100644
--- a/tests/HierarchyViewerTest/AndroidManifest.xml
+++ b/tests/HierarchyViewerTest/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -15,22 +16,21 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.test.hierarchyviewer">
+     package="com.android.test.hierarchyviewer">
 
     <application>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
-        <activity
-            android:name=".MainActivity"
-            android:label="HvTest" >
+        <activity android:name=".MainActivity"
+             android:label="HvTest"
+             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>
     </application>
 
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.test.hierarchyviewer" />
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+         android:targetPackage="com.android.test.hierarchyviewer"/>
 </manifest>
diff --git a/tests/HugeBackup/AndroidManifest.xml b/tests/HugeBackup/AndroidManifest.xml
index 923881b..945e59b 100644
--- a/tests/HugeBackup/AndroidManifest.xml
+++ b/tests/HugeBackup/AndroidManifest.xml
@@ -13,30 +13,32 @@
      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.android.hugebackup"
-    android:versionCode="1"
-    android:versionName="1.0">
+     package="com.android.hugebackup"
+     android:versionCode="1"
+     android:versionName="1.0">
 
     <!-- The backup/restore mechanism was introduced in API version 8 -->
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8"
+         android:targetSdkVersion="8"/>
 
     <application android:label="Huge Backup"
-        android:backupAgent="HugeAgent">
+         android:backupAgent="HugeAgent">
 
         <meta-data android:name="com.google.android.backup.api_key"
-            android:value="AEdPqrEAAAAINyoagzQOEEpIH3yw7LYCFN7CRX4FMd6TGIGVaA" />
+             android:value="AEdPqrEAAAAINyoagzQOEEpIH3yw7LYCFN7CRX4FMd6TGIGVaA"/>
 
-        <activity android:name="HugeBackupActivity">
+        <activity android:name="HugeBackupActivity"
+             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>
 
diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index 7b8c154..7790043 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -15,1045 +15,1044 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.test.hwui">
+     package="com.android.test.hwui">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature android:name="android.hardware.camera"/>
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
 
-    <uses-sdk android:minSdkVersion="21" />
+    <uses-sdk android:minSdkVersion="21"/>
 
-    <application
-        android:label="HwUi"
-        android:theme="@android:style/Theme.Material.Light">
+    <application android:label="HwUi"
+         android:theme="@android:style/Theme.Material.Light">
 
-        <activity
-                android:name="HwTests"
-                android:label="OpenGL Renderer Tests">
+        <activity android:name="HwTests"
+             android:label="OpenGL Renderer Tests"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PathOpsActivity"
-                android:label="Path/Ops">
+        <activity android:name="PathOpsActivity"
+             android:label="Path/Ops"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="AssetsAtlasActivity"
-                android:label="Atlas/Framework">
+        <activity android:name="AssetsAtlasActivity"
+             android:label="Atlas/Framework"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ScaledTextActivity"
-                android:label="Text/Scaled">
+        <activity android:name="ScaledTextActivity"
+             android:label="Text/Scaled"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="Rotate3dTextActivity"
-                android:label="Text/3D Rotation">
+        <activity android:name="Rotate3dTextActivity"
+             android:label="Text/3D Rotation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="NoAATextActivity"
-                android:label="Text/Aliased">
+        <activity android:name="NoAATextActivity"
+             android:label="Text/Aliased"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ScaledPathsActivity"
-                android:label="Path/Scaled">
+        <activity android:name="ScaledPathsActivity"
+             android:label="Path/Scaled"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="Alpha8BitmapActivity"
-                android:label="Bitmaps/Alpha8">
+        <activity android:name="Alpha8BitmapActivity"
+             android:label="Bitmaps/Alpha8"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MipMapActivity"
-                android:label="Bitmaps/MipMap">
+        <activity android:name="MipMapActivity"
+             android:label="Bitmaps/MipMap"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="DrawIntoHwBitmapActivity"
-            android:label="Bitmaps/DrawIntoHwBitmap">
+        <activity android:name="DrawIntoHwBitmapActivity"
+             android:label="Bitmaps/DrawIntoHwBitmap"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PathOffsetActivity"
-                android:label="Path/Offset">
+        <activity android:name="PathOffsetActivity"
+             android:label="Path/Offset"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MultiLayersActivity"
-                android:label="Layers/Multiple">
+        <activity android:name="MultiLayersActivity"
+             android:label="Layers/Multiple"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TJunctionActivity"
-                android:label="Layers/T-Junction">
+        <activity android:name="TJunctionActivity"
+             android:label="Layers/T-Junction"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TextPathActivity"
-                android:label="Text/As Path">
+        <activity android:name="TextPathActivity"
+             android:label="Text/As Path"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GradientStopsActivity"
-                android:label="Gradients/Multi-stops">
+        <activity android:name="GradientStopsActivity"
+             android:label="Gradients/Multi-stops"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PaintDrawFilterActivity"
-                android:label="Paint/Draw Filter">
+        <activity android:name="PaintDrawFilterActivity"
+             android:label="Paint/Draw Filter"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="BigGradientActivity"
-                android:label="Gradients/Large">
+        <activity android:name="BigGradientActivity"
+             android:label="Gradients/Large"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="DatePickerActivity"
-                android:label="View/DatePicker">
+
+        <activity android:name="DatePickerActivity"
+             android:label="View/DatePicker"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ClipRegionActivity"
-                android:label="Clip/Region 1">
+        <activity android:name="ClipRegionActivity"
+             android:label="Clip/Region 1"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ClipRegion2Activity"
-                android:label="Clip/Region 2">
+        <activity android:name="ClipRegion2Activity"
+             android:label="Clip/Region 2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ClipRegion3Activity"
-                android:label="Clip/Region 3">
+        <activity android:name="ClipRegion3Activity"
+             android:label="Clip/Region 3"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ClipOutlineActivity"
-                android:label="Clip/Outline">
+        <activity android:name="ClipOutlineActivity"
+             android:label="Clip/Outline"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="DisplayListLayersActivity"
-                android:label="Layers/Display Lists">
+        <activity android:name="DisplayListLayersActivity"
+             android:label="Layers/Display Lists"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MatrixActivity"
-                android:label="Misc/Matrix">
+        <activity android:name="MatrixActivity"
+             android:label="Misc/Matrix"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="LooperAcceleration"
-                android:label="Misc/LooperAcceleration">
+        <activity android:name="LooperAcceleration"
+             android:label="Misc/LooperAcceleration"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="TextFadeActivity"
-                android:label="Text/Fade">
+
+        <activity android:name="TextFadeActivity"
+             android:label="Text/Fade"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MaxBitmapSizeActivity"
-                android:label="Bitmaps/Max Size">
+        <activity android:name="MaxBitmapSizeActivity"
+             android:label="Bitmaps/Max Size"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TimeDialogActivity"
-                android:label="View/TimeDialog">
+        <activity android:name="TimeDialogActivity"
+             android:label="View/TimeDialog"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="ColoredShadowsActivity"
-            android:label="View/ColoredShadows"
-            android:theme="@style/ThemeColoredShadows">
+        <activity android:name="ColoredShadowsActivity"
+             android:label="View/ColoredShadows"
+             android:theme="@style/ThemeColoredShadows"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="OpaqueActivity"
-                android:label="Window/Opaque">
+
+        <activity android:name="OpaqueActivity"
+             android:label="Window/Opaque"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GetBitmapActivity"
-                android:label="TextureView/Get Bitmap">
+        <activity android:name="GetBitmapActivity"
+             android:label="TextureView/Get Bitmap"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="PictureCaptureDemo"
-            android:label="Debug/Picture Capture">
+        <activity android:name="PictureCaptureDemo"
+             android:label="Debug/Picture Capture"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="SmallCircleActivity"
-                android:label="Draw/Small Circle">
+
+        <activity android:name="SmallCircleActivity"
+             android:label="Draw/Small Circle"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ClearActivity"
-                android:label="Window/Clear">
+        <activity android:name="ClearActivity"
+             android:label="Window/Clear"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TextureViewActivity"
-                android:label="TextureView/Camera">
+        <activity android:name="TextureViewActivity"
+             android:label="TextureView/Camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GlyphCacheActivity"
-                android:label="Text/Glyph Cache">
+        <activity android:name="GlyphCacheActivity"
+             android:label="Text/Glyph Cache"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="CanvasTextureViewActivity"
-                android:label="TextureView/Canvas">
+        <activity android:name="CanvasTextureViewActivity"
+             android:label="TextureView/Canvas"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="HardwareCanvasTextureViewActivity"
-                android:label="TextureView/HardwareCanvas">
+        <activity android:name="HardwareCanvasTextureViewActivity"
+             android:label="TextureView/HardwareCanvas"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="SingleFrameTextureViewTestActivity"
-                android:label="TextureView/SingleFrameTextureViewTest">
+        <activity android:name="SingleFrameTextureViewTestActivity"
+             android:label="TextureView/SingleFrameTextureViewTest"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="HardwareCanvasSurfaceViewActivity"
-                android:label="SurfaceView/HardwareCanvas">
+        <activity android:name="HardwareCanvasSurfaceViewActivity"
+             android:label="SurfaceView/HardwareCanvas"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MovingSurfaceViewActivity"
-                android:label="SurfaceView/Animated Movement">
+        <activity android:name="MovingSurfaceViewActivity"
+             android:label="SurfaceView/Animated Movement"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GetBitmapSurfaceViewActivity"
-                android:label="SurfaceView/GetBitmap with Camera source">
+        <activity android:name="GetBitmapSurfaceViewActivity"
+             android:label="SurfaceView/GetBitmap with Camera source"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="VideoViewCaptureActivity"
-                android:label="SurfaceView/GetBitmap with Video source">
+        <activity android:name="VideoViewCaptureActivity"
+             android:label="SurfaceView/GetBitmap with Video source"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GLTextureViewActivity"
-                android:label="TextureView/OpenGL">
+        <activity android:name="GLTextureViewActivity"
+             android:label="TextureView/OpenGL"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="BitmapMeshActivity"
-                android:label="Bitmaps/Mesh">
+        <activity android:name="BitmapMeshActivity"
+             android:label="Bitmaps/Mesh"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="BitmapMutateActivity"
-                android:label="Bitmaps/Mutate">
+        <activity android:name="BitmapMutateActivity"
+             android:label="Bitmaps/Mutate"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="BitmapMeshLayerActivity"
-                android:label="Bitmaps/Mesh in Layer">
+        <activity android:name="BitmapMeshLayerActivity"
+             android:label="Bitmaps/Mesh in Layer"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-                
-        <activity
-                android:name="MarqueeActivity"
-                android:label="Text/Marquee">
+
+        <activity android:name="MarqueeActivity"
+             android:label="Text/Marquee"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ShapesActivity"
-                android:label="Path/Shapes">
+        <activity android:name="ShapesActivity"
+             android:label="Path/Shapes"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="ColoredRectsActivity"
-                android:label="Draw/Rects">
+
+        <activity android:name="ColoredRectsActivity"
+             android:label="Draw/Rects"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="SimplePatchActivity"
-                android:label="Draw/9-Patch"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        <activity android:name="SimplePatchActivity"
+             android:label="Draw/9-Patch"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ViewLayersActivity"
-                android:label="Layers/Views 1">
+        <activity android:name="ViewLayersActivity"
+             android:label="Layers/Views 1"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="ViewLayersActivity2"
-                android:label="Layers/Views 2">
+
+        <activity android:name="ViewLayersActivity2"
+             android:label="Layers/Views 2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="ViewLayersActivity3"
-                android:label="Layers/Views 3">
+
+        <activity android:name="ViewLayersActivity3"
+             android:label="Layers/Views 3"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ViewLayersActivity4"
-                android:label="Layers/Views 4">
+        <activity android:name="ViewLayersActivity4"
+             android:label="Layers/Views 4"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="ViewLayersActivity5"
-                android:label="Layers/Views 5">
+
+        <activity android:name="ViewLayersActivity5"
+             android:label="Layers/Views 5"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="AlphaLayersActivity"
-                android:label="Layers/Alpha">
+        <activity android:name="AlphaLayersActivity"
+             android:label="Layers/Alpha"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="AdvancedGradientsActivity"
-                android:label="Gradients/Advanced">
+
+        <activity android:name="AdvancedGradientsActivity"
+             android:label="Gradients/Advanced"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="Bitmaps3dActivity"
-                android:label="Bitmaps/3D Rotation">
+
+        <activity android:name="Bitmaps3dActivity"
+             android:label="Bitmaps/3D Rotation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="LabelsActivity"
-                android:label="View/TextView">
+
+        <activity android:name="LabelsActivity"
+             android:label="View/TextView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-            <activity
-                android:name="ViewFlipperActivity"
-                android:label="View/ViewFlipper"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <activity android:name="ViewFlipperActivity"
+                 android:label="View/ViewFlipper"
+                 android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                 android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ResizeActivity"
-                android:label="Window/Resize"
-                android:windowSoftInputMode="adjustResize">
+        <activity android:name="ResizeActivity"
+             android:label="Window/Resize"
+             android:windowSoftInputMode="adjustResize"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="TextGammaActivity"
-                android:label="Text/Gamma"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <activity android:name="TextGammaActivity"
+             android:label="Text/Gamma"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-            <activity
-                android:name="TextGammaActivity$SubGammaActivity"
-                android:label="Text/Sub Gamma"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                android:hardwareAccelerated="false">
+            <activity android:name="TextGammaActivity$SubGammaActivity"
+                 android:label="Text/Sub Gamma"
+                 android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                 android:hardwareAccelerated="false"
+                 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="LayersActivity"
-                android:label="Layers/Canvas Layers"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <activity android:name="LayersActivity"
+             android:label="Layers/Canvas Layers"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="NewLayersActivity"
-                android:label="Layers/Overlapping Layers">
+        <activity android:name="NewLayersActivity"
+             android:label="Layers/Overlapping Layers"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="XfermodeActivity"
-                android:label="Draw/Xfermodes"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <activity android:name="XfermodeActivity"
+             android:label="Draw/Xfermodes"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="BitmapsActivity"
-                android:label="Bitmaps/Draw Bitmaps"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <activity android:name="BitmapsActivity"
+             android:label="Bitmaps/Draw Bitmaps"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="BitmapsSkewActivity"
-                android:label="Bitmaps/Skew">
+
+        <activity android:name="BitmapsSkewActivity"
+             android:label="Bitmaps/Skew"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="BitmapsAlphaActivity"
-                android:label="Bitmaps/Alpha"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        <activity android:name="BitmapsAlphaActivity"
+             android:label="Bitmaps/Alpha"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="BitmapsRectActivity"
-                android:label="Bitmaps/Rect"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+
+        <activity android:name="BitmapsRectActivity"
+             android:label="Bitmaps/Rect"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ThinPatchesActivity"
-                android:label="Draw/9-Patch Thin Drawable"
-                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        <activity android:name="ThinPatchesActivity"
+             android:label="Draw/9-Patch Thin Drawable"
+             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="NinePatchesActivity"
-                android:label="Draw/9-Patch Drawable">
+
+        <activity android:name="NinePatchesActivity"
+             android:label="Draw/9-Patch Drawable"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MoreNinePatchesActivity"
-                android:label="Draw/9-Patch Vertical Drawable">
+        <activity android:name="MoreNinePatchesActivity"
+             android:label="Draw/9-Patch Vertical Drawable"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="QuickRejectActivity"
-                android:label="Clip/QuickReject">
+
+        <activity android:name="QuickRejectActivity"
+             android:label="Clip/QuickReject"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="RotationActivity"
-                android:label="View/Rotation">
+
+        <activity android:name="RotationActivity"
+             android:label="View/Rotation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="GradientsActivity"
-                android:label="Gradients/Gradients">
+
+        <activity android:name="GradientsActivity"
+             android:label="Gradients/Gradients"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ShadersActivity"
-                android:label="Shaders/Shaders">
+        <activity android:name="ShadersActivity"
+             android:label="Shaders/Shaders"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="TextActivity"
-                android:label="Text/Simple Text"
-                android:theme="@android:style/Theme.NoTitleBar">
+
+        <activity android:name="TextActivity"
+             android:label="Text/Simple Text"
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PosTextActivity"
-                android:label="Text/Pos Text"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="PosTextActivity"
+             android:label="Text/Pos Text"
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ListActivity"
-                android:label="View/List">
+        <activity android:name="ListActivity"
+             android:label="View/List"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TransparentListActivity"
-                android:label="View/Transparent List">
+        <activity android:name="TransparentListActivity"
+             android:label="View/Transparent List"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
-        
-        <activity
-                android:name="MoreShadersActivity"
-                android:label="Shaders/Compose Shaders">
+
+        <activity android:name="MoreShadersActivity"
+             android:label="Shaders/Compose Shaders"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ColorFiltersActivity"
-                android:label="ColorFilters/Filters">
+        <activity android:name="ColorFiltersActivity"
+             android:label="ColorFilters/Filters"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ColorFiltersMutateActivity"
-                android:label="ColorFilters/Mutate Filters">
+        <activity android:name="ColorFiltersMutateActivity"
+             android:label="ColorFilters/Mutate Filters"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="LinesActivity"
-                android:label="Draw/Lines">
+        <activity android:name="LinesActivity"
+             android:label="Draw/Lines"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="Lines2Activity"
-                android:label="Draw/Lines 2">
+        <activity android:name="Lines2Activity"
+             android:label="Draw/Lines 2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PathsActivity"
-                android:label="Path/Paths">
+        <activity android:name="PathsActivity"
+             android:label="Path/Paths"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TextOnPathActivity"
-                android:label="Text/Text on Path">
+        <activity android:name="TextOnPathActivity"
+             android:label="Text/Text on Path"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PathsCacheActivity"
-                android:label="Path/Cache">
+        <activity android:name="PathsCacheActivity"
+             android:label="Path/Cache"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />`
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>`
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PointsActivity"
-                android:label="Draw/Points">
+        <activity android:name="PointsActivity"
+             android:label="Draw/Points"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="Transform3dActivity"
-                android:label="Draw/3D Transform">
+        <activity android:name="Transform3dActivity"
+             android:label="Draw/3D Transform"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="Animated3dActivity"
-                android:label="Draw/Animated 3D Transform">
+        <activity android:name="Animated3dActivity"
+             android:label="Draw/Animated 3D Transform"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="SimplePathsActivity"
-                android:label="Path/Simple Paths">
+        <activity android:name="SimplePathsActivity"
+             android:label="Path/Simple Paths"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="AdvancedBlendActivity"
-                android:label="Draw/Advanced Blend">
+        <activity android:name="AdvancedBlendActivity"
+             android:label="Draw/Advanced Blend"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="FramebufferBlendActivity"
-                android:label="Draw/Framebuffer Blend">
+        <activity android:name="FramebufferBlendActivity"
+             android:label="Draw/Framebuffer Blend"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="StackActivity"
-                android:label="View/Stacks">
+        <activity android:name="StackActivity"
+             android:label="View/Stacks"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PathDestructionActivity"
-                android:label="Path/Path Destruction">
+        <activity android:name="PathDestructionActivity"
+             android:label="Path/Path Destruction"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="TransformsAndAnimationsActivity"
-                android:label="Draw/Transforms and Animations">
+        <activity android:name="TransformsAndAnimationsActivity"
+             android:label="Draw/Transforms and Animations"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ViewPropertyAlphaActivity"
-                android:label="View/Alpha Property">
+        <activity android:name="ViewPropertyAlphaActivity"
+             android:label="View/Alpha Property"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ViewLayerInvalidationActivity"
-                android:label="Layers/Invalidation">
+        <activity android:name="ViewLayerInvalidationActivity"
+             android:label="Layers/Invalidation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="ProjectionActivity"
-                android:label="Reordering/Projection">
+        <activity android:name="ProjectionActivity"
+             android:label="Reordering/Projection"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name=".ProjectionClippingActivity"
-                android:label="Reordering/Projection Clipping">
+        <activity android:name=".ProjectionClippingActivity"
+             android:label="Reordering/Projection Clipping"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name=".ZOrderingActivity"
-                android:label="Reordering/Z Ordering">
+        <activity android:name=".ZOrderingActivity"
+             android:label="Reordering/Z Ordering"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="GLDepthTestActivity"
-                android:label="Reordering/OpenGL Depth Test">
+        <activity android:name="GLDepthTestActivity"
+             android:label="Reordering/OpenGL Depth Test"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="CirclePropActivity"
-                android:label="Animation/Circle Props">
+        <activity android:name="CirclePropActivity"
+             android:label="Animation/Circle Props"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="RevealActivity"
-                android:label="Animation/Reveal Animation">
+        <activity android:name="RevealActivity"
+             android:label="Animation/Reveal Animation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="MultiProducerActivity"
-                android:label="Threads/Multiple Producers">
+        <activity android:name="MultiProducerActivity"
+             android:label="Threads/Multiple Producers"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PixelCopyWindow"
-                android:label="Readback/Window"
-                android:screenOrientation="fullSensor">
+        <activity android:name="PixelCopyWindow"
+             android:label="Readback/Window"
+             android:screenOrientation="fullSensor"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-                android:name="PositionListenerActivity"
-                android:label="RenderNode/PositionListener"
-                android:screenOrientation="fullSensor">
+        <activity android:name="PositionListenerActivity"
+             android:label="RenderNode/PositionListener"
+             android:screenOrientation="fullSensor"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="CustomRenderer"
-            android:label="HardwareRenderer/HelloTakeSurface"
-            android:screenOrientation="fullSensor">
+        <activity android:name="CustomRenderer"
+             android:label="HardwareRenderer/HelloTakeSurface"
+             android:screenOrientation="fullSensor"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="MyLittleTextureView"
-            android:label="HardwareRenderer/MyLittleTextureView"
-            android:screenOrientation="fullSensor">
+        <activity android:name="MyLittleTextureView"
+             android:label="HardwareRenderer/MyLittleTextureView"
+             android:screenOrientation="fullSensor"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.hwui.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.hwui.TEST"/>
             </intent-filter>
         </activity>
 
diff --git a/tests/Internal/AndroidManifest.xml b/tests/Internal/AndroidManifest.xml
index c85c3b1..dbba245 100644
--- a/tests/Internal/AndroidManifest.xml
+++ b/tests/Internal/AndroidManifest.xml
@@ -16,29 +16,30 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.internal.tests">
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.BIND_WALLPAPER" />
+     package="com.android.internal.tests">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.BIND_WALLPAPER"/>
     <application>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
         <service android:name="stub.DummyWallpaperService"
-                 android:enabled="true"
-                 android:directBootAware="true"
-                 android:label="Dummy wallpaper"
-                 android:permission="android.permission.BIND_WALLPAPER">
+             android:enabled="true"
+             android:directBootAware="true"
+             android:label="Dummy wallpaper"
+             android:permission="android.permission.BIND_WALLPAPER"
+             android:exported="true">
 
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
             </intent-filter>
 
             <!-- Link to XML that defines the wallpaper info. -->
             <meta-data android:name="android.service.wallpaper"
-                       android:resource="@xml/livewallpaper" />
+                 android:resource="@xml/livewallpaper"/>
         </service>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.internal.tests"
-                     android:label="Internal Tests" />
+         android:targetPackage="com.android.internal.tests"
+         android:label="Internal Tests"/>
 </manifest>
diff --git a/tests/JankBench/app/src/main/AndroidManifest.xml b/tests/JankBench/app/src/main/AndroidManifest.xml
index 58aa66f..fe431fd 100644
--- a/tests/JankBench/app/src/main/AndroidManifest.xml
+++ b/tests/JankBench/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,50 +14,48 @@
   ~ License.
   ~
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.benchmark">
+     package="com.android.benchmark">
 
-    <uses-sdk android:minSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="24"/>
 
-    <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <android:uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity
-            android:name=".app.HomeActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+    <application android:allowBackup="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".app.HomeActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             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=".app.RunLocalBenchmarksActivity"
-            android:exported="true">
+        <activity android:name=".app.RunLocalBenchmarksActivity"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.benchmark.ACTION_BENCHMARK" />
+                <action android:name="com.android.benchmark.ACTION_BENCHMARK"/>
             </intent-filter>
 
-            <meta-data
-                android:name="com.android.benchmark.benchmark_group"
-                android:resource="@xml/benchmark" />
+            <meta-data android:name="com.android.benchmark.benchmark_group"
+                 android:resource="@xml/benchmark"/>
         </activity>
-        <activity android:name=".ui.ListViewScrollActivity" />
-        <activity android:name=".ui.ImageListViewScrollActivity" />
-        <activity android:name=".ui.ShadowGridActivity" />
-        <activity android:name=".ui.TextScrollActivity" />
-        <activity android:name=".ui.EditTextInputActivity" />
-        <activity android:name=".synthetic.MemoryActivity" />
-        <activity android:name=".ui.FullScreenOverdrawActivity"></activity>
-        <activity android:name=".ui.BitmapUploadActivity"></activity>
+        <activity android:name=".ui.ListViewScrollActivity"/>
+        <activity android:name=".ui.ImageListViewScrollActivity"/>
+        <activity android:name=".ui.ShadowGridActivity"/>
+        <activity android:name=".ui.TextScrollActivity"/>
+        <activity android:name=".ui.EditTextInputActivity"/>
+        <activity android:name=".synthetic.MemoryActivity"/>
+        <activity android:name=".ui.FullScreenOverdrawActivity"/>
+        <activity android:name=".ui.BitmapUploadActivity"/>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/JobSchedulerTestApp/AndroidManifest.xml b/tests/JobSchedulerTestApp/AndroidManifest.xml
index 9654197..aeeaba4 100644
--- a/tests/JobSchedulerTestApp/AndroidManifest.xml
+++ b/tests/JobSchedulerTestApp/AndroidManifest.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.demo.jobSchedulerApp" >
+     package="com.android.demo.jobSchedulerApp">
 
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="18" />
+    <uses-sdk android:minSdkVersion="18"
+         android:targetSdkVersion="18"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.android.demo.jobSchedulerApp.MainActivity"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden" >
+    <application android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name"
+         android:theme="@style/AppTheme">
+        <activity android:name="com.android.demo.jobSchedulerApp.MainActivity"
+             android:label="@string/app_name"
+             android:windowSoftInputMode="stateHidden"
+             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>
 
-        <service
-            android:name=".service.TestJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true"/>
+        <service android:name=".service.TestJobService"
+             android:permission="android.permission.BIND_JOB_SERVICE"
+             android:exported="true"/>
     </application>
 
 </manifest>
diff --git a/tests/LargeAssetTest/AndroidManifest.xml b/tests/LargeAssetTest/AndroidManifest.xml
index c86118e4..ac55dcb 100644
--- a/tests/LargeAssetTest/AndroidManifest.xml
+++ b/tests/LargeAssetTest/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2010 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,15 +13,18 @@
      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.android.largeassettest">
+     package="com.android.largeassettest">
 
     <application>
-        <activity android:name="LargeAssetTest" android:label="Large Asset Test">
+        <activity android:name="LargeAssetTest"
+             android:label="Large Asset Test"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/LegacyAssistant/AndroidManifest.xml b/tests/LegacyAssistant/AndroidManifest.xml
index 7ae51037..942eafa 100644
--- a/tests/LegacyAssistant/AndroidManifest.xml
+++ b/tests/LegacyAssistant/AndroidManifest.xml
@@ -15,22 +15,23 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.legacyassistant">
+     package="com.google.android.test.legacyassistant">
 
     <application android:label="@string/activity_title">
 
         <activity android:name=".AssistActivity"
-            android:theme="@android:style/Theme.NoTitleBar">
+             android:theme="@android:style/Theme.NoTitleBar"
+             android:exported="true">
 
             <!-- Handle assist intent -->
             <intent-filter>
-                <action android:name="android.intent.action.ASSIST" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.ASSIST"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
 
             <!-- Provide icon for search -->
             <meta-data android:name="com.android.systemui.action_assist_icon"
-                    android:resource="@drawable/ic_action_assist" />
+                 android:resource="@drawable/ic_action_assist"/>
 
         </activity>
 
diff --git a/tests/LocationTracker/AndroidManifest.xml b/tests/LocationTracker/AndroidManifest.xml
index dc7ea99..0940ee3 100644
--- a/tests/LocationTracker/AndroidManifest.xml
+++ b/tests/LocationTracker/AndroidManifest.xml
@@ -1,30 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.locationtracker">
+     package="com.android.locationtracker">
 
     <!-- Permissions for the Location Service -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <!--  Permission for wifi -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <!-- give the location tracker ability to induce device insomnia -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <!--  Permission for SD card -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application android:label="@string/app_label">
-        <activity android:name="TrackerActivity" android:label="Location Tracker">
+        <activity android:name="TrackerActivity"
+             android:label="Location Tracker"
+             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>
-        <service android:name=".TrackerService" />
-        <activity android:label="@string/settings_menu" android:name="SettingsActivity" />
+        <service android:name=".TrackerService"/>
+        <activity android:label="@string/settings_menu"
+             android:name="SettingsActivity"/>
         <provider android:name=".data.TrackerProvider"
-            android:authorities="com.android.locationtracker" />
+             android:authorities="com.android.locationtracker"/>
     </application>
 
 </manifest>
diff --git a/tests/LockTaskTests/AndroidManifest.xml b/tests/LockTaskTests/AndroidManifest.xml
index e349c92..3ffdc47 100644
--- a/tests/LockTaskTests/AndroidManifest.xml
+++ b/tests/LockTaskTests/AndroidManifest.xml
@@ -1,56 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.example.locktasktests"
-    android:versionCode="1"
-    android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.google.android.example.locktasktests"
+     android:versionCode="1"
+     android:versionName="1.0">
+
+    <uses-sdk android:minSdkVersion="22"
+         android:targetSdkVersion="22"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:allowBackup="true" >
-        <activity
-            android:name="com.google.android.example.locktasktests.MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" >
+    <application android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name"
+         android:theme="@style/AppTheme"
+         android:allowBackup="true">
+        <activity android:name="com.google.android.example.locktasktests.MainActivity"
+             android:label="@string/app_name"
+             android:screenOrientation="portrait"
+             android:theme="@style/AppTheme"
+             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="com.google.android.example.locktasktests.LockDefaultActivity"
-            android:label="@string/title_activity_default"
-            android:taskAffinity=""
-            android:documentLaunchMode="always"
-            android:lockTaskMode="normal" >
+        <activity android:name="com.google.android.example.locktasktests.LockDefaultActivity"
+             android:label="@string/title_activity_default"
+             android:taskAffinity=""
+             android:documentLaunchMode="always"
+             android:lockTaskMode="normal">
         </activity>
-        <activity
-            android:name="com.google.android.example.locktasktests.LockTaskNeverActivity"
-            android:label="@string/title_activity_never"
-            android:taskAffinity=""
-            android:documentLaunchMode="always"
-            android:lockTaskMode="never" >
+        <activity android:name="com.google.android.example.locktasktests.LockTaskNeverActivity"
+             android:label="@string/title_activity_never"
+             android:taskAffinity=""
+             android:documentLaunchMode="always"
+             android:lockTaskMode="never">
         </activity>
-        <activity
-            android:name="com.google.android.example.locktasktests.LockWhitelistedActivity"
-            android:label="@string/title_activity_whitelist"
-            android:taskAffinity=""
-            android:documentLaunchMode="always"
-            android:lockTaskMode="if_whitelisted" >
+        <activity android:name="com.google.android.example.locktasktests.LockWhitelistedActivity"
+             android:label="@string/title_activity_whitelist"
+             android:taskAffinity=""
+             android:documentLaunchMode="always"
+             android:lockTaskMode="if_whitelisted">
         </activity>
-        <activity
-            android:name="com.google.android.example.locktasktests.LockAtLaunchActivity"
-            android:label="@string/title_activity_always"
-            android:taskAffinity=""
-            android:documentLaunchMode="always"
-            android:lockTaskMode="always" >
+        <activity android:name="com.google.android.example.locktasktests.LockAtLaunchActivity"
+             android:label="@string/title_activity_always"
+             android:taskAffinity=""
+             android:documentLaunchMode="always"
+             android:lockTaskMode="always">
         </activity>
     </application>
 
diff --git a/tests/LotsOfApps/AndroidManifest.xml b/tests/LotsOfApps/AndroidManifest.xml
index 585ddcc..3aed043 100644
--- a/tests/LotsOfApps/AndroidManifest.xml
+++ b/tests/LotsOfApps/AndroidManifest.xml
@@ -1,710 +1,912 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.lotsofapps">
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.VIBRATE" />
+     package="com.android.lotsofapps">
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.STATUS_BAR"/>
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application>
-        <activity android:name="com.android.lotsofapps.activity00" android:icon="@drawable/ic_launcher_add_folder">
+        <activity android:name="com.android.lotsofapps.activity00"
+             android:icon="@drawable/ic_launcher_add_folder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity01" android:icon="@drawable/ic_launcher_alarmclock">
+        <activity android:name="com.android.lotsofapps.activity01"
+             android:icon="@drawable/ic_launcher_alarmclock"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity02" android:icon="@drawable/ic_launcher_application">
+        <activity android:name="com.android.lotsofapps.activity02"
+             android:icon="@drawable/ic_launcher_application"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity03" android:icon="@drawable/ic_launcher_browser">
+        <activity android:name="com.android.lotsofapps.activity03"
+             android:icon="@drawable/ic_launcher_browser"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity04" android:icon="@drawable/ic_launcher_camera">
+        <activity android:name="com.android.lotsofapps.activity04"
+             android:icon="@drawable/ic_launcher_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity05" android:icon="@drawable/ic_launcher_camera_record">
+        <activity android:name="com.android.lotsofapps.activity05"
+             android:icon="@drawable/ic_launcher_camera_record"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity06" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity06"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity07" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity07"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity08" android:icon="@drawable/ic_launcher_folder">
+        <activity android:name="com.android.lotsofapps.activity08"
+             android:icon="@drawable/ic_launcher_folder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity09" android:icon="@drawable/ic_launcher_folder_bluetooth">
+        <activity android:name="com.android.lotsofapps.activity09"
+             android:icon="@drawable/ic_launcher_folder_bluetooth"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity10" android:icon="@drawable/ic_launcher_folder_live">
+        <activity android:name="com.android.lotsofapps.activity10"
+             android:icon="@drawable/ic_launcher_folder_live"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity11" android:icon="@drawable/ic_launcher_folder_live_contacts">
+        <activity android:name="com.android.lotsofapps.activity11"
+             android:icon="@drawable/ic_launcher_folder_live_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity12" android:icon="@drawable/ic_launcher_folder_live_contacts_phone">
+        <activity android:name="com.android.lotsofapps.activity12"
+             android:icon="@drawable/ic_launcher_folder_live_contacts_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity13" android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
+        <activity android:name="com.android.lotsofapps.activity13"
+             android:icon="@drawable/ic_launcher_folder_live_contacts_starred"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity14" android:icon="@drawable/ic_launcher_folder_open">
+        <activity android:name="com.android.lotsofapps.activity14"
+             android:icon="@drawable/ic_launcher_folder_open"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity15" android:icon="@drawable/ic_launcher_gallery">
+        <activity android:name="com.android.lotsofapps.activity15"
+             android:icon="@drawable/ic_launcher_gallery"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity16" android:icon="@drawable/ic_launcher_home">
+        <activity android:name="com.android.lotsofapps.activity16"
+             android:icon="@drawable/ic_launcher_home"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity17" android:icon="@drawable/ic_launcher_im">
+        <activity android:name="com.android.lotsofapps.activity17"
+             android:icon="@drawable/ic_launcher_im"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity18" android:icon="@drawable/ic_launcher_musicplayer_2">
+        <activity android:name="com.android.lotsofapps.activity18"
+             android:icon="@drawable/ic_launcher_musicplayer_2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity19" android:icon="@drawable/ic_launcher_phone">
+        <activity android:name="com.android.lotsofapps.activity19"
+             android:icon="@drawable/ic_launcher_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity20" android:icon="@drawable/ic_launcher_record_audio">
+        <activity android:name="com.android.lotsofapps.activity20"
+             android:icon="@drawable/ic_launcher_record_audio"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity21" android:icon="@drawable/ic_launcher_settings">
+        <activity android:name="com.android.lotsofapps.activity21"
+             android:icon="@drawable/ic_launcher_settings"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity22" android:icon="@drawable/ic_launcher_shortcut">
+        <activity android:name="com.android.lotsofapps.activity22"
+             android:icon="@drawable/ic_launcher_shortcut"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity23" android:icon="@drawable/ic_launcher_shortcut_browser_bookmark">
+        <activity android:name="com.android.lotsofapps.activity23"
+             android:icon="@drawable/ic_launcher_shortcut_browser_bookmark"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity24" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity24"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity25" android:icon="@drawable/ic_launcher_shortcut_directdial">
+        <activity android:name="com.android.lotsofapps.activity25"
+             android:icon="@drawable/ic_launcher_shortcut_directdial"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity26" android:icon="@drawable/ic_launcher_shortcut_directmessage">
+        <activity android:name="com.android.lotsofapps.activity26"
+             android:icon="@drawable/ic_launcher_shortcut_directmessage"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity27" android:icon="@drawable/ic_launcher_browser">
+        <activity android:name="com.android.lotsofapps.activity27"
+             android:icon="@drawable/ic_launcher_browser"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity28" android:icon="@drawable/ic_launcher_sim_toolkit">
+        <activity android:name="com.android.lotsofapps.activity28"
+             android:icon="@drawable/ic_launcher_sim_toolkit"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity29" android:icon="@drawable/ic_launcher_slideshow_add_sms">
+        <activity android:name="com.android.lotsofapps.activity29"
+             android:icon="@drawable/ic_launcher_slideshow_add_sms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity20" android:icon="@drawable/ic_launcher_slideshow_default_sms">
+        <activity android:name="com.android.lotsofapps.activity20"
+             android:icon="@drawable/ic_launcher_slideshow_default_sms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity31" android:icon="@drawable/ic_launcher_smsmms">
+        <activity android:name="com.android.lotsofapps.activity31"
+             android:icon="@drawable/ic_launcher_smsmms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity32" android:icon="@drawable/ic_launcher_soundrecorder">
+        <activity android:name="com.android.lotsofapps.activity32"
+             android:icon="@drawable/ic_launcher_soundrecorder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity33" android:icon="@drawable/ic_launcher_video_camera">
+        <activity android:name="com.android.lotsofapps.activity33"
+             android:icon="@drawable/ic_launcher_video_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity34" android:icon="@drawable/ic_launcher_video_player">
+        <activity android:name="com.android.lotsofapps.activity34"
+             android:icon="@drawable/ic_launcher_video_player"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity35" android:icon="@drawable/ic_launcher_wallpaper">
+        <activity android:name="com.android.lotsofapps.activity35"
+             android:icon="@drawable/ic_launcher_wallpaper"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity36" android:icon="@drawable/ic_launcher_im">
+        <activity android:name="com.android.lotsofapps.activity36"
+             android:icon="@drawable/ic_launcher_im"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity37" android:icon="@drawable/ic_launcher_musicplayer_2">
+        <activity android:name="com.android.lotsofapps.activity37"
+             android:icon="@drawable/ic_launcher_musicplayer_2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity38" android:icon="@drawable/ic_launcher_phone">
+        <activity android:name="com.android.lotsofapps.activity38"
+             android:icon="@drawable/ic_launcher_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity39" android:icon="@drawable/ic_launcher_record_audio">
+        <activity android:name="com.android.lotsofapps.activity39"
+             android:icon="@drawable/ic_launcher_record_audio"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity40" android:icon="@drawable/ic_launcher_settings">
+        <activity android:name="com.android.lotsofapps.activity40"
+             android:icon="@drawable/ic_launcher_settings"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity41" android:icon="@drawable/ic_launcher_shortcut">
+        <activity android:name="com.android.lotsofapps.activity41"
+             android:icon="@drawable/ic_launcher_shortcut"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity42" android:icon="@drawable/ic_launcher_sim_toolkit">
+        <activity android:name="com.android.lotsofapps.activity42"
+             android:icon="@drawable/ic_launcher_sim_toolkit"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity43" android:icon="@drawable/ic_launcher_smsmms">
+        <activity android:name="com.android.lotsofapps.activity43"
+             android:icon="@drawable/ic_launcher_smsmms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity44" android:icon="@drawable/ic_launcher_soundrecorder">
+        <activity android:name="com.android.lotsofapps.activity44"
+             android:icon="@drawable/ic_launcher_soundrecorder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity45" android:icon="@drawable/ic_launcher_video_camera">
+        <activity android:name="com.android.lotsofapps.activity45"
+             android:icon="@drawable/ic_launcher_video_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity46" android:icon="@drawable/ic_launcher_wallpaper">
+        <activity android:name="com.android.lotsofapps.activity46"
+             android:icon="@drawable/ic_launcher_wallpaper"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity47" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity47"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity48" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity48"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity49" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity49"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity50" android:icon="@drawable/ic_launcher_add_folder">
+        <activity android:name="com.android.lotsofapps.activity50"
+             android:icon="@drawable/ic_launcher_add_folder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity51" android:icon="@drawable/ic_launcher_alarmclock">
+        <activity android:name="com.android.lotsofapps.activity51"
+             android:icon="@drawable/ic_launcher_alarmclock"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity52" android:icon="@drawable/ic_launcher_application">
+        <activity android:name="com.android.lotsofapps.activity52"
+             android:icon="@drawable/ic_launcher_application"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity53" android:icon="@drawable/ic_launcher_browser">
+        <activity android:name="com.android.lotsofapps.activity53"
+             android:icon="@drawable/ic_launcher_browser"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity54" android:icon="@drawable/ic_launcher_camera">
+        <activity android:name="com.android.lotsofapps.activity54"
+             android:icon="@drawable/ic_launcher_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity55" android:icon="@drawable/ic_launcher_camera_record">
+        <activity android:name="com.android.lotsofapps.activity55"
+             android:icon="@drawable/ic_launcher_camera_record"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity56" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity56"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity57" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity57"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity58" android:icon="@drawable/ic_launcher_folder">
+        <activity android:name="com.android.lotsofapps.activity58"
+             android:icon="@drawable/ic_launcher_folder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity59" android:icon="@drawable/ic_launcher_folder_bluetooth">
+        <activity android:name="com.android.lotsofapps.activity59"
+             android:icon="@drawable/ic_launcher_folder_bluetooth"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity60" android:icon="@drawable/ic_launcher_folder_live">
+        <activity android:name="com.android.lotsofapps.activity60"
+             android:icon="@drawable/ic_launcher_folder_live"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity61" android:icon="@drawable/ic_launcher_folder_live_contacts">
+        <activity android:name="com.android.lotsofapps.activity61"
+             android:icon="@drawable/ic_launcher_folder_live_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity62" android:icon="@drawable/ic_launcher_folder_live_contacts_phone">
+        <activity android:name="com.android.lotsofapps.activity62"
+             android:icon="@drawable/ic_launcher_folder_live_contacts_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity63" android:icon="@drawable/ic_launcher_folder_live_contacts_starred">
+        <activity android:name="com.android.lotsofapps.activity63"
+             android:icon="@drawable/ic_launcher_folder_live_contacts_starred"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity64" android:icon="@drawable/ic_launcher_folder_open">
+        <activity android:name="com.android.lotsofapps.activity64"
+             android:icon="@drawable/ic_launcher_folder_open"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity65" android:icon="@drawable/ic_launcher_gallery">
+        <activity android:name="com.android.lotsofapps.activity65"
+             android:icon="@drawable/ic_launcher_gallery"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity66" android:icon="@drawable/ic_launcher_home">
+        <activity android:name="com.android.lotsofapps.activity66"
+             android:icon="@drawable/ic_launcher_home"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity67" android:icon="@drawable/ic_launcher_im">
+        <activity android:name="com.android.lotsofapps.activity67"
+             android:icon="@drawable/ic_launcher_im"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity68" android:icon="@drawable/ic_launcher_musicplayer_2">
+        <activity android:name="com.android.lotsofapps.activity68"
+             android:icon="@drawable/ic_launcher_musicplayer_2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity69" android:icon="@drawable/ic_launcher_phone">
+        <activity android:name="com.android.lotsofapps.activity69"
+             android:icon="@drawable/ic_launcher_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity70" android:icon="@drawable/ic_launcher_record_audio">
+        <activity android:name="com.android.lotsofapps.activity70"
+             android:icon="@drawable/ic_launcher_record_audio"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity71" android:icon="@drawable/ic_launcher_settings">
+        <activity android:name="com.android.lotsofapps.activity71"
+             android:icon="@drawable/ic_launcher_settings"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity72" android:icon="@drawable/ic_launcher_shortcut">
+        <activity android:name="com.android.lotsofapps.activity72"
+             android:icon="@drawable/ic_launcher_shortcut"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity73" android:icon="@drawable/ic_launcher_shortcut_browser_bookmark">
+        <activity android:name="com.android.lotsofapps.activity73"
+             android:icon="@drawable/ic_launcher_shortcut_browser_bookmark"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity74" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity74"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity75" android:icon="@drawable/ic_launcher_shortcut_directdial">
+        <activity android:name="com.android.lotsofapps.activity75"
+             android:icon="@drawable/ic_launcher_shortcut_directdial"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity76" android:icon="@drawable/ic_launcher_shortcut_directmessage">
+        <activity android:name="com.android.lotsofapps.activity76"
+             android:icon="@drawable/ic_launcher_shortcut_directmessage"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity77" android:icon="@drawable/ic_launcher_browser">
+        <activity android:name="com.android.lotsofapps.activity77"
+             android:icon="@drawable/ic_launcher_browser"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity78" android:icon="@drawable/ic_launcher_sim_toolkit">
+        <activity android:name="com.android.lotsofapps.activity78"
+             android:icon="@drawable/ic_launcher_sim_toolkit"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity79" android:icon="@drawable/ic_launcher_slideshow_add_sms">
+        <activity android:name="com.android.lotsofapps.activity79"
+             android:icon="@drawable/ic_launcher_slideshow_add_sms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity80" android:icon="@drawable/ic_launcher_slideshow_default_sms">
+        <activity android:name="com.android.lotsofapps.activity80"
+             android:icon="@drawable/ic_launcher_slideshow_default_sms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity81" android:icon="@drawable/ic_launcher_smsmms">
+        <activity android:name="com.android.lotsofapps.activity81"
+             android:icon="@drawable/ic_launcher_smsmms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity82" android:icon="@drawable/ic_launcher_soundrecorder">
+        <activity android:name="com.android.lotsofapps.activity82"
+             android:icon="@drawable/ic_launcher_soundrecorder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity83" android:icon="@drawable/ic_launcher_video_camera">
+        <activity android:name="com.android.lotsofapps.activity83"
+             android:icon="@drawable/ic_launcher_video_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity84" android:icon="@drawable/ic_launcher_video_player">
+        <activity android:name="com.android.lotsofapps.activity84"
+             android:icon="@drawable/ic_launcher_video_player"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity85" android:icon="@drawable/ic_launcher_wallpaper">
+        <activity android:name="com.android.lotsofapps.activity85"
+             android:icon="@drawable/ic_launcher_wallpaper"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity86" android:icon="@drawable/ic_launcher_im">
+        <activity android:name="com.android.lotsofapps.activity86"
+             android:icon="@drawable/ic_launcher_im"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity87" android:icon="@drawable/ic_launcher_musicplayer_2">
+        <activity android:name="com.android.lotsofapps.activity87"
+             android:icon="@drawable/ic_launcher_musicplayer_2"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity88" android:icon="@drawable/ic_launcher_phone">
+        <activity android:name="com.android.lotsofapps.activity88"
+             android:icon="@drawable/ic_launcher_phone"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity89" android:icon="@drawable/ic_launcher_record_audio">
+        <activity android:name="com.android.lotsofapps.activity89"
+             android:icon="@drawable/ic_launcher_record_audio"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity90" android:icon="@drawable/ic_launcher_settings">
+        <activity android:name="com.android.lotsofapps.activity90"
+             android:icon="@drawable/ic_launcher_settings"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity91" android:icon="@drawable/ic_launcher_shortcut">
+        <activity android:name="com.android.lotsofapps.activity91"
+             android:icon="@drawable/ic_launcher_shortcut"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity92" android:icon="@drawable/ic_launcher_sim_toolkit">
+        <activity android:name="com.android.lotsofapps.activity92"
+             android:icon="@drawable/ic_launcher_sim_toolkit"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity93" android:icon="@drawable/ic_launcher_smsmms">
+        <activity android:name="com.android.lotsofapps.activity93"
+             android:icon="@drawable/ic_launcher_smsmms"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity94" android:icon="@drawable/ic_launcher_soundrecorder">
+        <activity android:name="com.android.lotsofapps.activity94"
+             android:icon="@drawable/ic_launcher_soundrecorder"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity95" android:icon="@drawable/ic_launcher_video_camera">
+        <activity android:name="com.android.lotsofapps.activity95"
+             android:icon="@drawable/ic_launcher_video_camera"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity96" android:icon="@drawable/ic_launcher_wallpaper">
+        <activity android:name="com.android.lotsofapps.activity96"
+             android:icon="@drawable/ic_launcher_wallpaper"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity97" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity97"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity98" android:icon="@drawable/ic_launcher_contacts">
+        <activity android:name="com.android.lotsofapps.activity98"
+             android:icon="@drawable/ic_launcher_contacts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.android.lotsofapps.activity99" android:icon="@drawable/ic_launcher_drm_file">
+        <activity android:name="com.android.lotsofapps.activity99"
+             android:icon="@drawable/ic_launcher_drm_file"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/LowStorageTest/AndroidManifest.xml b/tests/LowStorageTest/AndroidManifest.xml
index 9d4a63ac..5b49656 100644
--- a/tests/LowStorageTest/AndroidManifest.xml
+++ b/tests/LowStorageTest/AndroidManifest.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.lowstoragetest">
+     package="com.android.lowstoragetest">
     <application android:label="LowStorageTest">
         <activity android:name="LowStorageTest"
-                  android:theme="@android:style/Theme.Black.NoTitleBar">
+             android:theme="@android:style/Theme.Black.NoTitleBar"
+             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>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/ManagedProfileLifecycleStressTest/app/DummyDPC/AndroidManifest.xml b/tests/ManagedProfileLifecycleStressTest/app/DummyDPC/AndroidManifest.xml
index 860940d..aefb076 100644
--- a/tests/ManagedProfileLifecycleStressTest/app/DummyDPC/AndroidManifest.xml
+++ b/tests/ManagedProfileLifecycleStressTest/app/DummyDPC/AndroidManifest.xml
@@ -15,17 +15,16 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.dummydpc">
+     package="com.android.dummydpc">
 
-    <application
-        android:testOnly="true">
-        <receiver
-            android:name="com.android.dummydpc.DummyDeviceAdminReceiver"
-            android:permission="android.permission.BIND_DEVICE_ADMIN">
+    <application android:testOnly="true">
+        <receiver android:name="com.android.dummydpc.DummyDeviceAdminReceiver"
+             android:permission="android.permission.BIND_DEVICE_ADMIN"
+             android:exported="true">
             <meta-data android:name="android.app.device_admin"
-                       android:resource="@xml/device_admin" />
+                 android:resource="@xml/device_admin"/>
             <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
     </application>
diff --git a/tests/MirrorSurfaceTest/AndroidManifest.xml b/tests/MirrorSurfaceTest/AndroidManifest.xml
index 123cd0f..6385cc8 100644
--- a/tests/MirrorSurfaceTest/AndroidManifest.xml
+++ b/tests/MirrorSurfaceTest/AndroidManifest.xml
@@ -16,14 +16,15 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.test.mirrorsurface">
+     package="com.google.android.test.mirrorsurface">
     <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER"/>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application android:label="MirrorSurfaceTest">
         <activity android:name=".MirrorSurfaceActivity"
-                  android:label="Mirror Surface"
-                  android:configChanges="orientation|screenSize">
+             android:label="Mirror Surface"
+             android:configChanges="orientation|screenSize"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/OneMedia/AndroidManifest.xml b/tests/OneMedia/AndroidManifest.xml
index 8697f1b..7fc3524 100644
--- a/tests/OneMedia/AndroidManifest.xml
+++ b/tests/OneMedia/AndroidManifest.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.onemedia"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.android.onemedia"
+     android:versionCode="1"
+     android:versionName="1.0">
 
     <uses-sdk android:minSdkVersion="19"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+    <application android:allowBackup="true"
+         android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name"
+         android:theme="@style/AppTheme">
 
-        <uses-library android:name="org.apache.http.legacy" android:required="false" />
-        <activity
-            android:name="com.android.onemedia.OnePlayerActivity"
-            android:label="@string/app_name" >
+        <uses-library android:name="org.apache.http.legacy"
+             android:required="false"/>
+        <activity android:name="com.android.onemedia.OnePlayerActivity"
+             android:label="@string/app_name"
+             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>
-        <service
-            android:name="com.android.onemedia.OnePlayerService"
-            android:exported="true"
-            android:process="com.android.onemedia.service" />
+        <service android:name="com.android.onemedia.OnePlayerService"
+             android:exported="true"
+             android:process="com.android.onemedia.service"/>
     </application>
 
 </manifest>
diff --git a/tests/RenderThreadTest/AndroidManifest.xml b/tests/RenderThreadTest/AndroidManifest.xml
index a7f4f6e..22a4e43 100644
--- a/tests/RenderThreadTest/AndroidManifest.xml
+++ b/tests/RenderThreadTest/AndroidManifest.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.renderthread"
-    android:versionCode="1"
-    android:versionName="1.0" >
+     package="com.example.renderthread"
+     android:versionCode="1"
+     android:versionName="1.0">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" >
+    <application android:allowBackup="true"
+         android:icon="@drawable/ic_launcher"
+         android:label="@string/app_name"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             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=".SubActivity"
-            android:theme="@style/AppTheme.Transparent" />
+             android:theme="@style/AppTheme.Transparent"/>
     </application>
 
 </manifest>
diff --git a/tests/SerialChat/AndroidManifest.xml b/tests/SerialChat/AndroidManifest.xml
index 0efdb58..7aedb52 100644
--- a/tests/SerialChat/AndroidManifest.xml
+++ b/tests/SerialChat/AndroidManifest.xml
@@ -15,16 +15,18 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.serialchat">
+     package="com.android.serialchat">
 
     <uses-permission android:name="android.permission.SERIAL_PORT"/>
 
     <application android:label="Serial Chat">
-        <activity android:name="SerialChat" android:label="Serial Chat">
+        <activity android:name="SerialChat"
+             android:label="Serial Chat"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/ServiceCrashTest/AndroidManifest.xml b/tests/ServiceCrashTest/AndroidManifest.xml
index 387c8b8..e906fe2 100644
--- a/tests/ServiceCrashTest/AndroidManifest.xml
+++ b/tests/ServiceCrashTest/AndroidManifest.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.tests.servicecrashtest">
+     package="com.android.tests.servicecrashtest">
 
     <application android:label="Service Crash Test">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
         <service android:name=".CrashingService"
-                android:process=":badservice" />
+             android:process=":badservice"/>
 
-        <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"/>
             </intent-filter>
         </activity>
     </application>
 
     <instrumentation android:label="Test bound service crash restart"
-            android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.android.tests.servicecrashtest" />
+         android:name="android.test.InstrumentationTestRunner"
+         android:targetPackage="com.android.tests.servicecrashtest"/>
 
 </manifest>
diff --git a/tests/SharedLibrary/client/AndroidManifest.xml b/tests/SharedLibrary/client/AndroidManifest.xml
index d1167fa..9903a98 100644
--- a/tests/SharedLibrary/client/AndroidManifest.xml
+++ b/tests/SharedLibrary/client/AndroidManifest.xml
@@ -15,23 +15,26 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.lib_client">
-    <application android:label="@string/app_title" android:theme="@style/Theme">
-        <uses-library android:name="android.test.runner" />
-        <uses-library android:name="com.google.android.test.shared_library" />
-        <activity android:name="ActivityMain">
+     package="com.google.android.test.lib_client">
+    <application android:label="@string/app_title"
+         android:theme="@style/Theme">
+        <uses-library android:name="android.test.runner"/>
+        <uses-library android:name="com.google.android.test.shared_library"/>
+        <activity android:name="ActivityMain"
+             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>
 
-        <receiver android:name="DependentAppwidgetProvider">
+        <receiver android:name="DependentAppwidgetProvider"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider"
-                       android:resource="@xml/dependent_appwidget_info" />
+                 android:resource="@xml/dependent_appwidget_info"/>
         </receiver>
     </application>
 </manifest>
diff --git a/tests/SharedLibrary/lib/AndroidManifest.xml b/tests/SharedLibrary/lib/AndroidManifest.xml
index bb939dd..df2fdca 100644
--- a/tests/SharedLibrary/lib/AndroidManifest.xml
+++ b/tests/SharedLibrary/lib/AndroidManifest.xml
@@ -15,15 +15,16 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.shared_library"
-    android:versionCode="2">
+     package="com.google.android.test.shared_library"
+     android:versionCode="2">
     <application android:label="SharedLibrary">
-        <library android:name="com.google.android.test.shared_library" />
+        <library android:name="com.google.android.test.shared_library"/>
         <activity android:name="ActivityMain"
-                  android:icon="@drawable/size_48x48">
+             android:icon="@drawable/size_48x48"
+             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>
     </application>
diff --git a/tests/ShowWhenLockedApp/AndroidManifest.xml b/tests/ShowWhenLockedApp/AndroidManifest.xml
index a872e06..82957b7 100644
--- a/tests/ShowWhenLockedApp/AndroidManifest.xml
+++ b/tests/ShowWhenLockedApp/AndroidManifest.xml
@@ -16,12 +16,13 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.showwhenlocked">
+     package="com.android.showwhenlocked">
     <application android:label="ShowWhenLocked">
         <activity android:name=".ShowWhenLockedActivity"
-                  android:showWhenLocked="true"
-                  android:turnScreenOn="true"
-                  android:launchMode="singleTask">
+             android:showWhenLocked="true"
+             android:turnScreenOn="true"
+             android:launchMode="singleTask"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/SmokeTest/AndroidManifest.xml b/tests/SmokeTest/AndroidManifest.xml
index f141bdc..57f0431 100644
--- a/tests/SmokeTest/AndroidManifest.xml
+++ b/tests/SmokeTest/AndroidManifest.xml
@@ -15,18 +15,19 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.smoketest">
+     package="com.android.smoketest">
 
     <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name=".SmokeTestActivity" 
-                  android:label="Smoke Tests">
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name=".SmokeTestActivity"
+             android:label="Smoke Tests"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.TEST"/>
             </intent-filter>
         </activity>
 
     </application>
-    
+
 </manifest>
diff --git a/tests/SmokeTestApps/AndroidManifest.xml b/tests/SmokeTestApps/AndroidManifest.xml
index 0f20107..89e63b1 100644
--- a/tests/SmokeTestApps/AndroidManifest.xml
+++ b/tests/SmokeTestApps/AndroidManifest.xml
@@ -15,30 +15,33 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.smoketest.triggers">
+     package="com.android.smoketest.triggers">
 
     <application android:label="something">
         <activity android:name=".CrashyApp"
-                  android:label="Test Crashy App">
+             android:label="Test Crashy App"
+             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=".CrashyApp2"
-                  android:label="Test Crashy App2">
+             android:label="Test Crashy App2"
+             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=".UnresponsiveApp"
-                  android:label="Test Unresponsive App">
+             android:label="Test Unresponsive App"
+             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>
     </application>
diff --git a/tests/SoundTriggerTestApp/AndroidManifest.xml b/tests/SoundTriggerTestApp/AndroidManifest.xml
index 87f3e92..587a25d 100644
--- a/tests/SoundTriggerTestApp/AndroidManifest.xml
+++ b/tests/SoundTriggerTestApp/AndroidManifest.xml
@@ -1,27 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.test.soundtrigger">
-    <uses-permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD" />
-    <uses-permission android:name="android.permission.MANAGE_SOUND_TRIGGER" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+     package="com.android.test.soundtrigger">
+    <uses-permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+    <uses-permission android:name="android.permission.MANAGE_SOUND_TRIGGER"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <application>
-        <activity
-            android:name=".SoundTriggerTestActivity"
-            android:label="SoundTrigger Test Application"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Material">
+        <activity android:name=".SoundTriggerTestActivity"
+             android:label="SoundTrigger Test Application"
+             android:screenOrientation="portrait"
+             android:theme="@android:style/Theme.Material"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <service
-            android:name=".SoundTriggerTestService"
-            android:stopWithTask="false"
-            android:exported="true">
+        <service android:name=".SoundTriggerTestService"
+             android:stopWithTask="false"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.intent.action.MANAGE_SOUND_TRIGGER" />
+                <action android:name="com.android.intent.action.MANAGE_SOUND_TRIGGER"/>
             </intent-filter>
         </service>
     </application>
diff --git a/tests/Split/AndroidManifest.xml b/tests/Split/AndroidManifest.xml
index 0de8344..e036527 100644
--- a/tests/Split/AndroidManifest.xml
+++ b/tests/Split/AndroidManifest.xml
@@ -15,13 +15,14 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.example.split">
+     package="com.android.example.split">
     <application android:label="@string/app_title"
-            android:icon="@mipmap/ic_app">
-        <activity android:name="ActivityMain">
+         android:icon="@mipmap/ic_app">
+        <activity android:name="ActivityMain"
+             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>
     </application>
diff --git a/tests/StatusBar/AndroidManifest.xml b/tests/StatusBar/AndroidManifest.xml
index 6a082e9..8744dae 100644
--- a/tests/StatusBar/AndroidManifest.xml
+++ b/tests/StatusBar/AndroidManifest.xml
@@ -1,56 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.statusbartest">
-    <uses-permission android:name="android.permission.DEVICE_POWER" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.STATUS_BAR" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS" />
+     package="com.android.statusbartest">
+    <uses-permission android:name="android.permission.DEVICE_POWER"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.STATUS_BAR"/>
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
 
     <application>
-        <activity android:name="StatusBarTest" android:label="_StatusBar">
+        <activity android:name="StatusBarTest"
+             android:label="_StatusBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="NotificationTestList" android:label="_Notifications">
+        <activity android:name="NotificationTestList"
+             android:label="_Notifications"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name="NotificationBuilderTest"
-                android:label="_Notify Builder"
-                android:theme="@android:style/Theme.Holo"
-                android:hardwareAccelerated="true"
-                >
+             android:label="_Notify Builder"
+             android:theme="@android:style/Theme.Holo"
+             android:hardwareAccelerated="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="ToastTest" android:label="_Toasts">
+        <activity android:name="ToastTest"
+             android:label="_Toasts"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="PowerTest" android:label="_Power">
+        <activity android:name="PowerTest"
+             android:label="_Power"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="ConfirmationActivity" android:theme="@android:style/Theme.Dialog">
+        <activity android:name="ConfirmationActivity"
+             android:theme="@android:style/Theme.Dialog">
         </activity>
-        <activity android:name="TestAlertActivity" android:theme="@android:style/Theme.Dialog">
+        <activity android:name="TestAlertActivity"
+             android:theme="@android:style/Theme.Dialog">
         </activity>
     </application>
 </manifest>
diff --git a/tests/SurfaceComposition/AndroidManifest.xml b/tests/SurfaceComposition/AndroidManifest.xml
index 4c0a9b6..46c8f88 100644
--- a/tests/SurfaceComposition/AndroidManifest.xml
+++ b/tests/SurfaceComposition/AndroidManifest.xml
@@ -16,21 +16,22 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.surfacecomposition">
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+     package="android.surfacecomposition">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <application android:theme="@style/noeffects">
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="android.surfacecomposition.SurfaceCompositionMeasuringActivity" >
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.surfacecomposition.SurfaceCompositionMeasuringActivity"
+             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>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <!--  self-instrumenting test package. -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.surfacecomposition">
+         android:targetPackage="android.surfacecomposition">
     </instrumentation>
 </manifest>
diff --git a/tests/SurfaceControlViewHostTest/AndroidManifest.xml b/tests/SurfaceControlViewHostTest/AndroidManifest.xml
index ee95763..7e9a04d 100644
--- a/tests/SurfaceControlViewHostTest/AndroidManifest.xml
+++ b/tests/SurfaceControlViewHostTest/AndroidManifest.xml
@@ -13,10 +13,12 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.test.viewembed">
+     package="com.android.test.viewembed">
 
     <application>
-        <activity android:name="SurfaceControlViewHostTest" android:label="View Embedding Test">
+        <activity android:name="SurfaceControlViewHostTest"
+             android:label="View Embedding Test"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/SystemUIDemoModeController/AndroidManifest.xml b/tests/SystemUIDemoModeController/AndroidManifest.xml
index 2e97932..5feb4ac 100644
--- a/tests/SystemUIDemoModeController/AndroidManifest.xml
+++ b/tests/SystemUIDemoModeController/AndroidManifest.xml
@@ -15,23 +15,21 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.demomodecontroller"
-    android:versionCode="1"
-    android:versionName="0.1" >
+     package="com.example.android.demomodecontroller"
+     android:versionCode="1"
+     android:versionName="0.1">
 
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="19"
+         android:targetSdkVersion="19"/>
 
-    <application
-        android:allowBackup="false"
-        android:label="@string/app_name" >
-        <activity
-            android:name=".DemoModeController" >
+    <application android:allowBackup="false"
+         android:label="@string/app_name">
+        <activity android:name=".DemoModeController"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/TaskOrganizerTest/AndroidManifest.xml b/tests/TaskOrganizerTest/AndroidManifest.xml
index a77d7ee..f0ba71a 100644
--- a/tests/TaskOrganizerTest/AndroidManifest.xml
+++ b/tests/TaskOrganizerTest/AndroidManifest.xml
@@ -10,16 +10,19 @@
      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.android.test.taskembed">
-    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
-    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+     package="com.android.test.taskembed">
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
+    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <application>
       <service android:name=".TaskOrganizerPipTest"
-               android:exported="true">
+           android:exported="true">
       </service>
-      <activity android:name="TaskOrganizerMultiWindowTest" android:label="TaskOrganizer MW Test">
+      <activity android:name="TaskOrganizerMultiWindowTest"
+           android:label="TaskOrganizer MW Test"
+           android:exported="true">
         <intent-filter>
           <action android:name="android.intent.action.MAIN"/>
           <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/tests/TouchLatency/app/src/main/AndroidManifest.xml b/tests/TouchLatency/app/src/main/AndroidManifest.xml
index e4aa4dc..9894736 100644
--- a/tests/TouchLatency/app/src/main/AndroidManifest.xml
+++ b/tests/TouchLatency/app/src/main/AndroidManifest.xml
@@ -15,20 +15,19 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.prefabulated.touchlatency" >
+     package="com.prefabulated.touchlatency">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".TouchLatencyActivity"
-            android:label="@string/app_name" >
+    <application android:allowBackup="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:theme="@style/AppTheme">
+        <activity android:name=".TouchLatencyActivity"
+             android:label="@string/app_name"
+             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>
     </application>
diff --git a/tests/TransformTest/AndroidManifest.xml b/tests/TransformTest/AndroidManifest.xml
index 5c9995f..19854fe 100644
--- a/tests/TransformTest/AndroidManifest.xml
+++ b/tests/TransformTest/AndroidManifest.xml
@@ -15,13 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.transform">
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
+     package="com.google.android.test.transform">
+    <uses-sdk android:minSdkVersion="7"
+         android:targetSdkVersion="7"/>
     <application android:label="TransformTest">
-        <activity android:name="TransformTestActivity">
+        <activity android:name="TransformTestActivity"
+             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>
     </application>
diff --git a/tests/TransitionTests/AndroidManifest.xml b/tests/TransitionTests/AndroidManifest.xml
index 35e7b69..4822619 100644
--- a/tests/TransitionTests/AndroidManifest.xml
+++ b/tests/TransitionTests/AndroidManifest.xml
@@ -1,250 +1,284 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.transitiontests"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <application
-            android:icon="@drawable/icon"
-            android:label="@string/app_name"
-            android:hardwareAccelerated="true"
-            android:theme="@style/AppTheme">
+     package="com.android.transitiontests"
+     android:versionCode="1"
+     android:versionName="1.0">
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <application android:icon="@drawable/icon"
+         android:label="@string/app_name"
+         android:hardwareAccelerated="true"
+         android:theme="@style/AppTheme">
         <activity android:label="@string/states_test1"
-                  android:name="ScenesTestv21">
+             android:name="ScenesTestv21"
+             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:label="@string/states_test_auto_targets"
-                  android:name="ScenesTestAutoTargets">
+             android:name="ScenesTestAutoTargets"
+             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:label="@string/states_test_auto_transition"
-                  android:name="ScenesTestAutoTransition">
+             android:name="ScenesTestAutoTransition"
+             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:label="@string/states_test_auto_transition2"
-                  android:name="ScenesTestAutoTransition2">
+             android:name="ScenesTestAutoTransition2"
+             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:label="@string/contacts_expansion"
-                  android:name="ContactsExpansion">
+             android:name="ContactsExpansion"
+             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:label="Demo0"
-                  android:name="Demo0">
+             android:name="Demo0"
+             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:label="Demo1"
-                  android:name="Demo1">
+             android:name="Demo1"
+             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:label="Demo2"
-                  android:name="Demo2">
+             android:name="Demo2"
+             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:label="Demo3"
-                  android:name="Demo3">
+             android:name="Demo3"
+             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:label="Demo4"
-                  android:name="Demo4">
+             android:name="Demo4"
+             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:label="Demo5"
-                  android:name="Demo5">
+             android:name="Demo5"
+             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:label="LoginActivity"
-                  android:name="LoginActivity">
+             android:name="LoginActivity"
+             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:label="LoginActivityFromResources"
-                  android:name="LoginActivityFromResources">
+             android:name="LoginActivityFromResources"
+             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:label="OverlayTest"
-                  android:name="OverlayTest">
+             android:name="OverlayTest"
+             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:label="ResourceLoadingTest"
-                  android:name="ResourceLoadingTest">
+             android:name="ResourceLoadingTest"
+             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:label="FadingTest"
-                  android:name="FadingTest">
+             android:name="FadingTest"
+             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:label="UniqueIds"
-                  android:name="UniqueIds">
+             android:name="UniqueIds"
+             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:label="HitRectBug"
-                  android:name="HitRectBug">
+             android:name="HitRectBug"
+             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:label="SequenceTest"
-                  android:name="SequenceTest">
+             android:name="SequenceTest"
+             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:label="SequenceTestSimple"
-                  android:name="SequenceTestSimple">
+             android:name="SequenceTestSimple"
+             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:label="ChangingText"
-                  android:name="ChangingText">
+             android:name="ChangingText"
+             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:label="ClippingText"
-                  android:name="ClippingText">
+             android:name="ClippingText"
+             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:label="ListViewAddRemove"
-                  android:name="ListViewAddRemove">
+             android:name="ListViewAddRemove"
+             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:label="ListViewAddRemoveNoTransition"
-                  android:name="ListViewAddRemoveNoTransition">
+             android:name="ListViewAddRemoveNoTransition"
+             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:label="CrossFadeDemo"
-                  android:name="CrossFadeDemo">
+             android:name="CrossFadeDemo"
+             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:label="Reparenting"
-                  android:name="Reparenting">
+             android:name="Reparenting"
+             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:label="SurfaceAndTextureViews"
-                  android:name="SurfaceAndTextureViews">
+             android:name="SurfaceAndTextureViews"
+             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:label="InstanceTargets"
-                  android:name="InstanceTargets">
+             android:name="InstanceTargets"
+             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:label="InterruptionTest"
-                  android:name="InterruptionTest">
+             android:name="InterruptionTest"
+             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:label="DelayedTransition"
-                  android:name="DelayedTransition">
+             android:name="DelayedTransition"
+             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:label="FadingHierachy"
-                  android:name=".FadingHierarchy">
+             android:name=".FadingHierarchy"
+             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:label="HierarchicalMove"
-                  android:name=".HierarchicalMove">
+             android:name=".HierarchicalMove"
+             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:label="CrossfadeImage"
-                  android:name=".CrossfadeImage">
+             android:name=".CrossfadeImage"
+             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:label="CrossfadeMultiple"
-                  android:name=".CrossfadeMultiple">
+             android:name=".CrossfadeMultiple"
+             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>
 
diff --git a/tests/TtsTests/AndroidManifest.xml b/tests/TtsTests/AndroidManifest.xml
index b6d5111..cf1c162 100644
--- a/tests/TtsTests/AndroidManifest.xml
+++ b/tests/TtsTests/AndroidManifest.xml
@@ -15,29 +15,32 @@
 limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.speech.tts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.speech.tts">
     <application>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
 
         <service android:name=".MockableTextToSpeechService"
-                 android:label="Mockable Text-to-speech Service">
+             android:label="Mockable Text-to-speech Service"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.TTS_SERVICE" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.TTS_SERVICE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </service>
 
         <activity android:name=".MockableCheckVoiceData"
-                  android:theme="@android:style/Theme.NoDisplay">
+             android:theme="@android:style/Theme.NoDisplay"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.speech.tts.engine.CHECK_TTS_DATA" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.speech.tts.engine.CHECK_TTS_DATA"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.android.speech.tts"
-                     android:label="Tests for android.speech.tts" />
+         android:targetPackage="com.android.speech.tts"
+         android:label="Tests for android.speech.tts"/>
 </manifest>
diff --git a/tests/UiBench/AndroidManifest.xml b/tests/UiBench/AndroidManifest.xml
index c6b4a54..a5e90c0 100644
--- a/tests/UiBench/AndroidManifest.xml
+++ b/tests/UiBench/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -13,297 +14,294 @@
   ~ 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.android.test.uibench">
 
-    <application
-        android:allowBackup="false"
-        android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-        tools:ignore="MissingApplicationIcon">
-        <uses-library android:name="android.test.runner" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.android.test.uibench">
+
+    <application android:allowBackup="false"
+         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+         tools:ignore="MissingApplicationIcon">
+        <uses-library android:name="android.test.runner"/>
 
         <!-- Root navigation activity -->
-        <activity
-            android:name=".MainActivity"
-            android:label="UiBench">
+        <activity android:name=".MainActivity"
+             android:label="UiBench"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
         <!-- General -->
-        <activity
-            android:name=".DialogListActivity"
-            android:label="General/Dialog List" >
+        <activity android:name=".DialogListActivity"
+             android:label="General/Dialog List"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".GlTextureViewActivity"
-            android:label="General/GL TextureView" >
+        <activity android:name=".GlTextureViewActivity"
+             android:label="General/GL TextureView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".FullscreenOverdrawActivity"
-            android:label="General/Fullscreen Overdraw" >
+        <activity android:name=".FullscreenOverdrawActivity"
+             android:label="General/Fullscreen Overdraw"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".InvalidateActivity"
-            android:label="General/Invalidate" >
+        <activity android:name=".InvalidateActivity"
+             android:label="General/Invalidate"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".InvalidateTreeActivity"
-            android:label="General/Invalidate Tree" >
+        <activity android:name=".InvalidateTreeActivity"
+             android:label="General/Invalidate Tree"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ResizeHWLayerActivity"
-            android:label="General/Resize HW Layer" >
+        <activity android:name=".ResizeHWLayerActivity"
+             android:label="General/Resize HW Layer"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TrivialAnimationActivity"
-            android:label="General/Trivial Animation" >
+        <activity android:name=".TrivialAnimationActivity"
+             android:label="General/Trivial Animation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TrivialAnimationActivityWideGamut"
-            android:label="General/Trivial Animation (Wide Gamut)"
-            android:colorMode="wideColorGamut">
+        <activity android:name=".TrivialAnimationActivityWideGamut"
+             android:label="General/Trivial Animation (Wide Gamut)"
+             android:colorMode="wideColorGamut"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TrivialListActivity"
-            android:label="General/Trivial ListView" >
+        <activity android:name=".TrivialListActivity"
+             android:label="General/Trivial ListView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".FadingEdgeListActivity"
-            android:label="General/Fading Edge ListView" >
+        <activity android:name=".FadingEdgeListActivity"
+             android:label="General/Fading Edge ListView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".SaveLayerInterleaveActivity"
-            android:label="General/SaveLayer Animation" >
+        <activity android:name=".SaveLayerInterleaveActivity"
+             android:label="General/SaveLayer Animation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ClippedListActivity"
-            android:label="General/Clipped ListView"
-            android:theme="@style/NoActionBar">
+        <activity android:name=".ClippedListActivity"
+             android:label="General/Clipped ListView"
+             android:theme="@style/NoActionBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TrivialRecyclerViewActivity"
-            android:label="General/Trivial RecyclerView" >
+        <activity android:name=".TrivialRecyclerViewActivity"
+             android:label="General/Trivial RecyclerView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".SlowBindRecyclerViewActivity"
-            android:label="General/Slow Bind RecyclerView" >
+        <activity android:name=".SlowBindRecyclerViewActivity"
+             android:label="General/Slow Bind RecyclerView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".SlowNestedRecyclerViewActivity"
-            android:label="General/Slow Nested RecyclerView" >
+        <activity android:name=".SlowNestedRecyclerViewActivity"
+             android:label="General/Slow Nested RecyclerView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ActivityTransition"
-            android:label="Transitions/Activity Transition" >
+        <activity android:name=".ActivityTransition"
+             android:label="Transitions/Activity Transition"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ActivityTransitionDetails"
-            android:label="Transitions/Activity Transition " >
+        <activity android:name=".ActivityTransitionDetails"
+             android:label="Transitions/Activity Transition "
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
                 <!-- Part of ActivityTransition test above, so not in TEST category -->
             </intent-filter>
         </activity>
 
         <!-- Rendering -->
-        <activity
-            android:name=".BitmapUploadActivity"
-            android:label="Rendering/Bitmap Upload" >
+        <activity android:name=".BitmapUploadActivity"
+             android:label="Rendering/Bitmap Upload"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ShadowGridActivity"
-            android:label="Rendering/Shadow Grid" >
+        <activity android:name=".ShadowGridActivity"
+             android:label="Rendering/Shadow Grid"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".RenderingJitter"
-            android:label="Rendering/Jitter" >
+        <activity android:name=".RenderingJitter"
+             android:label="Rendering/Jitter"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
         <!-- Inflation -->
-        <activity
-            android:name=".InflatingListActivity"
-            android:label="Inflation/Inflating ListView" >
+        <activity android:name=".InflatingListActivity"
+             android:label="Inflation/Inflating ListView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity-alias
-            android:name=".InflatingEmojiListActivity"
-            android:label="Inflation/Inflating ListView with Emoji"
-            android:targetActivity=".InflatingListActivity">
+        <activity-alias android:name=".InflatingEmojiListActivity"
+             android:label="Inflation/Inflating ListView with Emoji"
+             android:targetActivity=".InflatingListActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity-alias>
 
-        <activity-alias
-            android:name=".InflatingHanListActivity"
-            android:label="Inflation/Inflating ListView with Han Characters"
-            android:targetActivity=".InflatingListActivity">
+        <activity-alias android:name=".InflatingHanListActivity"
+             android:label="Inflation/Inflating ListView with Han Characters"
+             android:targetActivity=".InflatingListActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity-alias>
 
-        <activity-alias
-            android:name=".InflatingLongStringListActivity"
-            android:label="Inflation/Inflating ListView with long string"
-            android:targetActivity=".InflatingListActivity">
+        <activity-alias android:name=".InflatingLongStringListActivity"
+             android:label="Inflation/Inflating ListView with long string"
+             android:targetActivity=".InflatingListActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity-alias>
 
         <!-- Text -->
-        <activity
-            android:name=".EditTextTypeActivity"
-            android:label="Text/EditText Typing" >
+        <activity android:name=".EditTextTypeActivity"
+             android:label="Text/EditText Typing"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TextCacheLowHitrateActivity"
-            android:label="Text/Layout Cache Low Hitrate" >
+        <activity android:name=".TextCacheLowHitrateActivity"
+             android:label="Text/Layout Cache Low Hitrate"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".TextCacheHighHitrateActivity"
-            android:label="Text/Layout Cache High Hitrate" >
+        <activity android:name=".TextCacheHighHitrateActivity"
+             android:label="Text/Layout Cache High Hitrate"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
         <!-- WebView -->
-        <activity
-                android:name=".ScrollableWebViewActivity"
-                android:label="WebView/Scrollable WebView" >
+        <activity android:name=".ScrollableWebViewActivity"
+             android:label="WebView/Scrollable WebView"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
         <!-- Navigation Drawer -->
-        <activity
-            android:name=".NavigationDrawerActivity"
-            android:label="Navigation Drawer Activity"
-            android:theme="@style/NoActionBar">
+        <activity android:name=".NavigationDrawerActivity"
+             android:label="Navigation Drawer Activity"
+             android:theme="@style/NoActionBar"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
         <!-- Notification Shade -->
-        <activity
-            android:name=".NotificationShadeActivity"
-            android:label="Notification Shade">
+        <activity android:name=".NotificationShadeActivity"
+             android:label="Notification Shade"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".leanback.BrowseActivity"
-            android:theme="@style/Theme.Leanback.Browse"
-            android:label="Leanback/Browse Fragment" >
+        <activity android:name=".leanback.BrowseActivity"
+             android:theme="@style/Theme.Leanback.Browse"
+             android:label="Leanback/Browse Fragment"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.test.uibench.TEST" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.android.test.uibench.TEST"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/UsageReportingTest/AndroidManifest.xml b/tests/UsageReportingTest/AndroidManifest.xml
index be0b09e..4a3487f 100644
--- a/tests/UsageReportingTest/AndroidManifest.xml
+++ b/tests/UsageReportingTest/AndroidManifest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
   Note: Add android:sharedUserId="android.uid.system" to the root element to simulate the system UID
   caller case.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.tests.usagereporter"
-    >
+     package="com.android.tests.usagereporter">
 
     <application android:label="@string/reporter_app">
         <activity android:name="UsageReporterActivity"
-                  android:label="UsageReporter">
+             android:label="UsageReporter"
+             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>
 
diff --git a/tests/UsageStatsTest/AndroidManifest.xml b/tests/UsageStatsTest/AndroidManifest.xml
index fefd993..82e5be1 100644
--- a/tests/UsageStatsTest/AndroidManifest.xml
+++ b/tests/UsageStatsTest/AndroidManifest.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
   Note: Add android:sharedUserId="android.uid.system" to the root element to simulate the system UID
   caller case.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.tests.usagestats"
-    >
+     package="com.android.tests.usagestats">
 
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
-    <uses-permission android:name="android.permission.OBSERVE_APP_USAGE" />
-    <uses-permission android:name="android.permission.SUSPEND_APPS" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+    <uses-permission android:name="android.permission.OBSERVE_APP_USAGE"/>
+    <uses-permission android:name="android.permission.SUSPEND_APPS"/>
 
     <application android:label="Usage Access Test">
         <activity android:name=".UsageStatsActivity"
-                  android:label="Device Usage History">
+             android:label="Device Usage History"
+             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=".UsageLogActivity" />
+        <activity android:name=".UsageLogActivity"/>
 
     </application>
 </manifest>
diff --git a/tests/UsbHostExternalManagmentTest/AoapTestDevice/AndroidManifest.xml b/tests/UsbHostExternalManagmentTest/AoapTestDevice/AndroidManifest.xml
index 99bb520..fadd0ea 100644
--- a/tests/UsbHostExternalManagmentTest/AoapTestDevice/AndroidManifest.xml
+++ b/tests/UsbHostExternalManagmentTest/AoapTestDevice/AndroidManifest.xml
@@ -13,18 +13,19 @@
      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.android.hardware.usb.aoapdevicetest" >
-    <application android:label="UsbAoapDeviceTestApp" >
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.android.hardware.usb.aoapdevicetest">
+    <application android:label="UsbAoapDeviceTestApp">
         <activity android:name=".UsbAoapDeviceTestActivity"
-            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>
diff --git a/tests/UsbHostExternalManagmentTest/AoapTestHost/AndroidManifest.xml b/tests/UsbHostExternalManagmentTest/AoapTestHost/AndroidManifest.xml
index 8cc470e..9ad17ab 100644
--- a/tests/UsbHostExternalManagmentTest/AoapTestHost/AndroidManifest.xml
+++ b/tests/UsbHostExternalManagmentTest/AoapTestHost/AndroidManifest.xml
@@ -13,18 +13,19 @@
      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.android.hardware.usb.aoaphosttest" >
-    <application android:label="UsbAoapHostTestApp" >
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.android.hardware.usb.aoaphosttest">
+    <application android:label="UsbAoapHostTestApp">
       <activity android:name=".UsbAoapHostTestActivity"
-            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>
     </application>
 </manifest>
diff --git a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/AndroidManifest.xml b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/AndroidManifest.xml
index 97bbefb..627e46b 100644
--- a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/AndroidManifest.xml
+++ b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/AndroidManifest.xml
@@ -13,19 +13,21 @@
      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.android.hardware.usb.externalmanagementtest" >
 
-    <uses-permission android:name="android.permission.MANAGE_USB" />
-    <application android:label="UsbHostExternalManagementTestApp" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+     package="com.android.hardware.usb.externalmanagementtest">
+
+    <uses-permission android:name="android.permission.MANAGE_USB"/>
+    <application android:label="UsbHostExternalManagementTestApp">
         <activity android:name=".UsbHostManagementActivity"
-            android:configChanges="keyboard|keyboardHidden" >
+             android:configChanges="keyboard|keyboardHidden"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/VectorDrawableTest/AndroidManifest.xml b/tests/VectorDrawableTest/AndroidManifest.xml
index 7b3beb2..5334dac 100644
--- a/tests/VectorDrawableTest/AndroidManifest.xml
+++ b/tests/VectorDrawableTest/AndroidManifest.xml
@@ -16,147 +16,146 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.test.dynamic" >
+     package="com.android.test.dynamic">
 
-    <application
-        android:hardwareAccelerated="true"
-        android:label="vector"
-        android:supportsRtl="true" >
-        <activity
-            android:name="VectorDrawablePerformance"
-            android:label="Vector Performance" >
+    <application android:hardwareAccelerated="true"
+         android:label="vector"
+         android:supportsRtl="true">
+        <activity android:name="VectorDrawablePerformance"
+             android:label="Vector Performance"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="BitmapDrawableDupe"
-            android:label="Bitmap Performance of clones" >
+        <activity android:name="BitmapDrawableDupe"
+             android:label="Bitmap Performance of clones"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
 
         </activity>
-        <activity
-            android:name="VectorDrawableAnimation"
-            android:label="VectorTestAnimation" >
+        <activity android:name="VectorDrawableAnimation"
+             android:label="VectorTestAnimation"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorDrawableTest"
-            android:label="Vector Icon" >
+        <activity android:name="VectorDrawableTest"
+             android:label="Vector Icon"
+             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.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="AnimatedVectorDrawableTest"
-            android:label="AnimatedVectorDrawableTest" >
+        <activity android:name="AnimatedVectorDrawableTest"
+             android:label="AnimatedVectorDrawableTest"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="AnimatedStateVectorDrawableTest"
-            android:label="AnimatedStateList and AnimatedVectorDrawable" >
+        <activity android:name="AnimatedStateVectorDrawableTest"
+             android:label="AnimatedStateList and AnimatedVectorDrawable"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorDrawable01"
-            android:label="VectorTest1" >
+        <activity android:name="VectorDrawable01"
+             android:label="VectorTest1"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorDrawableDupPerf"
-            android:label="Vector Performance of clones" >
+        <activity android:name="VectorDrawableDupPerf"
+             android:label="Vector Performance of clones"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="AnimatedVectorDrawableDupPerf"
-            android:label="Animated Vector Performance of clones" >
+        <activity android:name="AnimatedVectorDrawableDupPerf"
+             android:label="Animated Vector Performance of clones"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorDrawableStaticPerf"
-            android:label="System icons" >
+        <activity android:name="VectorDrawableStaticPerf"
+             android:label="System icons"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorCheckbox"
-            android:label="Basic static vector drawables" >
+        <activity android:name="VectorCheckbox"
+             android:label="Basic static vector drawables"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="VectorPathChecking"
-            android:label="Path Checking graphics" >
+        <activity android:name="VectorPathChecking"
+             android:label="Path Checking graphics"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="ScaleDrawableTests"
-            android:label="Scale Type Test" >
+        <activity android:name="ScaleDrawableTests"
+             android:label="Scale Type Test"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="AnimatedVectorDrawableAttr"
-            android:label="AnimatedVectorDrawable Attr Test" >
+        <activity android:name="AnimatedVectorDrawableAttr"
+             android:label="AnimatedVectorDrawable Attr Test"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="BoundsCheckTest"
-            android:label="SetBound check" >
+        <activity android:name="BoundsCheckTest"
+             android:label="SetBound check"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="com.android.test.dynamic.TEST" />
+                <category android:name="com.android.test.dynamic.TEST"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/VoiceEnrollment/AndroidManifest.xml b/tests/VoiceEnrollment/AndroidManifest.xml
index 46f6ff5..d30f21c 100644
--- a/tests/VoiceEnrollment/AndroidManifest.xml
+++ b/tests/VoiceEnrollment/AndroidManifest.xml
@@ -1,20 +1,20 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.test.voiceenrollment">
+<?xml version="1.0" encoding="utf-8"?>
 
-    <uses-permission android:name="android.permission.MANAGE_VOICE_KEYPHRASES" />
-    <application
-        android:permission="android.permission.MANAGE_VOICE_KEYPHRASES">
-        <activity
-            android:name="TestEnrollmentActivity"
-            android:label="Voice Enrollment Application"
-            android:theme="@android:style/Theme.Material.Light.Voice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.test.voiceenrollment">
+
+    <uses-permission android:name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+    <application android:permission="android.permission.MANAGE_VOICE_KEYPHRASES">
+        <activity android:name="TestEnrollmentActivity"
+             android:label="Voice Enrollment Application"
+             android:theme="@android:style/Theme.Material.Light.Voice"
+             android:exported="true">
             <intent-filter>
-                <action android:name="com.android.intent.action.MANAGE_VOICE_KEYPHRASES" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.android.intent.action.MANAGE_VOICE_KEYPHRASES"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <meta-data
-            android:name="android.voice_enrollment"
-            android:resource="@xml/enrollment_application"/>
+        <meta-data android:name="android.voice_enrollment"
+             android:resource="@xml/enrollment_application"/>
     </application>
 </manifest>
diff --git a/tests/VoiceInteraction/AndroidManifest.xml b/tests/VoiceInteraction/AndroidManifest.xml
index 5fdf0dd..5d8cea7 100644
--- a/tests/VoiceInteraction/AndroidManifest.xml
+++ b/tests/VoiceInteraction/AndroidManifest.xml
@@ -1,74 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.test.voiceinteraction">
+     package="com.android.test.voiceinteraction">
 
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="25" />
+    <uses-sdk android:minSdkVersion="23"
+         android:targetSdkVersion="25"/>
 
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
-    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
 
     <application>
-        <activity android:name="VoiceInteractionMain" android:label="Voice Interaction"
-                android:theme="@android:style/Theme.Material">
+        <activity android:name="VoiceInteractionMain"
+             android:label="Voice Interaction"
+             android:theme="@android:style/Theme.Material"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity android:name="AssistProxyActivity"
-                android:label="Test Assist Proxy"
-                android:theme="@android:style/Theme.NoDisplay"
-                android:excludeFromRecents="true"
-                android:noHistory="true"
-                android:taskAffinity="">
+             android:label="Test Assist Proxy"
+             android:theme="@android:style/Theme.NoDisplay"
+             android:excludeFromRecents="true"
+             android:noHistory="true"
+             android:taskAffinity=""
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.ASSIST" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.ASSIST"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity android:name="SettingsActivity"
-                android:label="Voice Interaction Settings">
+             android:label="Voice Interaction Settings"
+             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="MainInteractionService"
-                android:label="Test Voice Interaction Service"
-                android:permission="android.permission.BIND_VOICE_INTERACTION"
-                android:process=":interactor">
+             android:label="Test Voice Interaction Service"
+             android:permission="android.permission.BIND_VOICE_INTERACTION"
+             android:process=":interactor"
+             android:exported="true">
             <meta-data android:name="android.voice_interaction"
-                       android:resource="@xml/interaction_service" />
+                 android:resource="@xml/interaction_service"/>
             <intent-filter>
-                <action android:name="android.service.voice.VoiceInteractionService" />
+                <action android:name="android.service.voice.VoiceInteractionService"/>
             </intent-filter>
         </service>
         <service android:name="MainInteractionSessionService"
-                android:permission="android.permission.BIND_VOICE_INTERACTION"
-                android:process=":session">
+             android:permission="android.permission.BIND_VOICE_INTERACTION"
+             android:process=":session">
         </service>
         <service android:name="MainRecognitionService"
-                android:label="Test Voice Interaction Service">
+             android:label="Test Voice Interaction Service"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.speech.RecognitionService" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.speech.RecognitionService"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-            <meta-data android:name="android.speech" android:resource="@xml/recognition_service" />
+            <meta-data android:name="android.speech"
+                 android:resource="@xml/recognition_service"/>
         </service>
-        <activity android:name="TestInteractionActivity" android:label="Voice Interaction Target"
-                  android:theme="@android:style/Theme.Material.Light">
+        <activity android:name="TestInteractionActivity"
+             android:label="Voice Interaction Target"
+             android:theme="@android:style/Theme.Material.Light"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.VOICE"/>
             </intent-filter>
         </activity>
-        <activity android:name="StartVoiceInteractionActivity" android:label="In-Activity Voice"
-                  android:theme="@android:style/Theme.Material.Light">
+        <activity android:name="StartVoiceInteractionActivity"
+             android:label="In-Activity Voice"
+             android:theme="@android:style/Theme.Material.Light"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/WallpaperTest/AndroidManifest.xml b/tests/WallpaperTest/AndroidManifest.xml
index 4c914dd..8d7ccb9 100644
--- a/tests/WallpaperTest/AndroidManifest.xml
+++ b/tests/WallpaperTest/AndroidManifest.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.wallpapertest" >
+     package="com.example.wallpapertest">
 
-    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS"/>
 
-    <application
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" >
+    <application android:label="@string/app_name"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             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>
 
-        <service
-            android:label="@string/test_wallpaper"
-            android:name=".TestWallpaper"
-            android:permission="android.permission.BIND_WALLPAPER"
-            android:enabled="true">
+        <service android:label="@string/test_wallpaper"
+             android:name=".TestWallpaper"
+             android:permission="android.permission.BIND_WALLPAPER"
+             android:enabled="true"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.service.wallpaper.WallpaperService" />
+                <action android:name="android.service.wallpaper.WallpaperService"/>
             </intent-filter>
             <meta-data android:name="android.service.wallpaper"
-                       android:resource="@xml/test_wallpaper" />
+                 android:resource="@xml/test_wallpaper"/>
         </service>
     </application>
 </manifest>
diff --git a/tests/WindowAnimationJank/AndroidManifest.xml b/tests/WindowAnimationJank/AndroidManifest.xml
index d7aef33..34d2440 100644
--- a/tests/WindowAnimationJank/AndroidManifest.xml
+++ b/tests/WindowAnimationJank/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
  * Copyright (C) 2015 The Android Open Source Project
  *
@@ -15,26 +14,28 @@
  * 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="android.windowanimationjank">
 
-  <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.windowanimationjank">
+
+  <uses-permission android:name="android.permission.EXPAND_STATUS_BAR"/>
 
   <application>
       <uses-library android:name="android.test.runner"/>
       <activity android:name="ElementLayoutActivity"
-                android:label="ElementLayoutActivity"
-                android:taskAffinity="android.windowanimationjank.ElementLayoutActivity" >
+           android:label="ElementLayoutActivity"
+           android:taskAffinity="android.windowanimationjank.ElementLayoutActivity"
+           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>
   </application>
 
     <!--  self-instrumenting test package. -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.windowanimationjank">
+         android:targetPackage="android.windowanimationjank">
     </instrumentation>
 
 </manifest>
diff --git a/tests/WindowInsetsTests/AndroidManifest.xml b/tests/WindowInsetsTests/AndroidManifest.xml
index 0f6282e..5978054 100644
--- a/tests/WindowInsetsTests/AndroidManifest.xml
+++ b/tests/WindowInsetsTests/AndroidManifest.xml
@@ -16,16 +16,17 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.test.windowinsetstests">
+     package="com.google.android.test.windowinsetstests">
 
     <application android:label="@string/activity_title">
         <activity android:name=".WindowInsetsActivity"
-            android:theme="@style/appTheme"
-            android:windowSoftInputMode="adjustResize">
+             android:theme="@style/appTheme"
+             android:windowSoftInputMode="adjustResize"
+             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>
     </application>
diff --git a/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml b/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml
index bf6a7cb..3601992 100644
--- a/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml
+++ b/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml
@@ -1,36 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.tests.appwidgethost">
-    <uses-permission android:name="android.permission.VIBRATE" />
+     package="com.android.tests.appwidgethost">
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application>
-        <activity android:name="AppWidgetHostActivity" android:label="_AppWidgetHost">
+        <activity android:name="AppWidgetHostActivity"
+             android:label="_AppWidgetHost"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="TestAppWidgetConfigure" android:label="Configure TestAppWidgetProvider">
+        <activity android:name="TestAppWidgetConfigure"
+             android:label="Configure TestAppWidgetProvider"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
         <!-- BEGIN_INCLUDE(AppWidgetProvider) -->
         <receiver android:name="TestAppWidgetProvider"
-                    android:label="@string/oh_hai"
-                    android:icon="@drawable/oh_hai_icon"
-                    >
+             android:label="@string/oh_hai"
+             android:icon="@drawable/oh_hai_icon"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider"
-                        android:resource="@xml/appwidget_info"
-                        />
+                 android:resource="@xml/appwidget_info"/>
         </receiver>
         <!-- END_INCLUDE(AppWidgetProvider) -->
-        
+
     </application>
 </manifest>
diff --git a/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml b/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml
index ec4d583..4f6a81f 100644
--- a/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml
+++ b/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml
@@ -1,13 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.tests.appwidgetprovider">
-    <uses-permission android:name="android.permission.VIBRATE" />
+     package="com.android.tests.appwidgetprovider">
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application>
-        <receiver android:name="TestAppWidgetProvider">
+        <receiver android:name="TestAppWidgetProvider"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
-            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
+            <meta-data android:name="android.appwidget.provider"
+                 android:resource="@xml/appwidget_info"/>
         </receiver>
     </application>
 </manifest>
diff --git a/tests/backup/AndroidManifest.xml b/tests/backup/AndroidManifest.xml
index 3778742..f0a3eb2d 100644
--- a/tests/backup/AndroidManifest.xml
+++ b/tests/backup/AndroidManifest.xml
@@ -1,11 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.backuptest">
+     package="com.android.backuptest">
     <application android:backupAgent="BackupTestAgent">
-        <activity android:name="BackupTestActivity" android:label="_BackupTest">
+        <activity android:name="BackupTestActivity"
+             android:label="_BackupTest"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/tests/net/integration/AndroidManifest.xml b/tests/net/integration/AndroidManifest.xml
index 09c0e48..e2d9362 100644
--- a/tests/net/integration/AndroidManifest.xml
+++ b/tests/net/integration/AndroidManifest.xml
@@ -16,50 +16,53 @@
  * limitations under the License.
  */
 -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.server.net.integrationtests">
+     package="com.android.server.net.integrationtests">
 
     <!-- For ConnectivityService registerReceiverAsUser (receiving broadcasts) -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
     <!-- PermissionMonitor sets network permissions for each user -->
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_USERS"/>
     <!-- ConnectivityService sends notifications to BatteryStats -->
-    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
+    <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
     <!-- Reading network status -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.NETWORK_FACTORY" />
-    <uses-permission android:name="android.permission.NETWORK_STACK" />
-    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.NETWORK_FACTORY"/>
+    <uses-permission android:name="android.permission.NETWORK_STACK"/>
+    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY"/>
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
     <!-- Reading DeviceConfig flags -->
-    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
     <application android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
 
         <!-- This manifest is merged with the base manifest of the real NetworkStack app.
-             Remove the NetworkStackService from the base (real) manifest, and replace with a test
-             service that responds to the same intent -->
+                         Remove the NetworkStackService from the base (real) manifest, and replace with a test
+                         service that responds to the same intent -->
         <service android:name=".TestNetworkStackService"
-                 android:process="com.android.server.net.integrationtests.testnetworkstack">
+             android:process="com.android.server.net.integrationtests.testnetworkstack"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.net.INetworkStackConnector.Test"/>
             </intent-filter>
         </service>
         <service android:name=".NetworkStackInstrumentationService"
-                 android:process="com.android.server.net.integrationtests.testnetworkstack">
+             android:process="com.android.server.net.integrationtests.testnetworkstack"
+             android:exported="true">
             <intent-filter>
                 <action android:name=".INetworkStackInstrumentation"/>
             </intent-filter>
         </service>
         <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
-                 android:process="com.android.server.net.integrationtests.testnetworkstack"
-                 android:permission="android.permission.BIND_JOB_SERVICE"/>
+             android:process="com.android.server.net.integrationtests.testnetworkstack"
+             android:permission="android.permission.BIND_JOB_SERVICE"/>
 
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.server.net.integrationtests"
-                     android:label="Frameworks Net Integration Tests" />
+         android:targetPackage="com.android.server.net.integrationtests"
+         android:label="Frameworks Net Integration Tests"/>
 
 </manifest>
diff --git a/tests/utils/DummyIME/AndroidManifest.xml b/tests/utils/DummyIME/AndroidManifest.xml
index fd17a52..4dc0b57 100644
--- a/tests/utils/DummyIME/AndroidManifest.xml
+++ b/tests/utils/DummyIME/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
  * Copyright 2006, The Android Open Source Project
@@ -17,16 +18,20 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.testing.dummyime">
+     package="com.android.testing.dummyime">
     <application android:label="Dummy IME">
         <service android:name="DummyIme"
-                android:permission="android.permission.BIND_INPUT_METHOD">
+             android:permission="android.permission.BIND_INPUT_METHOD"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.view.InputMethod" />
+                <action android:name="android.view.InputMethod"/>
             </intent-filter>
-            <meta-data android:name="android.view.im" android:resource="@xml/method" />
+            <meta-data android:name="android.view.im"
+                 android:resource="@xml/method"/>
         </service>
-        <activity android:name=".ImePreferences" android:label="Dummy IME Settings">
+        <activity android:name=".ImePreferences"
+             android:label="Dummy IME Settings"
+             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
diff --git a/wifi/tests/AndroidManifest.xml b/wifi/tests/AndroidManifest.xml
index b6c38bc..8fcf78f 100644
--- a/wifi/tests/AndroidManifest.xml
+++ b/wifi/tests/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
   ~ Copyright (C) 2016 The Android Open Source Project
   ~
@@ -17,22 +16,23 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.net.wifi.test">
+     package="android.net.wifi.test">
 
     <application>
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
         <activity android:label="WifiTestDummyLabel"
-                  android:name="WifiTestDummyName">
+             android:name="WifiTestDummyName"
+             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"/>
             </intent-filter>
         </activity>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="android.net.wifi.test"
-        android:label="Frameworks Wifi API Tests">
+         android:targetPackage="android.net.wifi.test"
+         android:label="Frameworks Wifi API Tests">
     </instrumentation>
 
 </manifest>