Snap for 10447354 from a0f224fe7030a56df7538dabe3fae13788c8d8fd to mainline-wifi-release

Change-Id: I6b599ada2d6b9064c6bad6b710f24069f6ac2369
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a382b75..0556b06 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-feature android:name="android.hardware.usb.host"/>
     <uses-permission android:name="android.permission.ACCESS_MTP"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="android.permission.MANAGE_USB"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.MANAGE_USERS"/>
@@ -28,7 +29,9 @@
             </intent-filter>
         </provider>
 
-        <service android:name=".MtpDocumentsService"/>
+        <service android:name=".MtpDocumentsService"
+                 android:foregroundServiceType="dataSync">
+        </service>
 
         <activity android:name=".ReceiverActivity"
              android:label="@string/downloads_app_label"
diff --git a/OWNERS b/OWNERS
index bcf40cd..0f01090 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,3 @@
-marcone@google.com
 jsharkey@android.com
 nandana@google.com
 jameswei@google.com