Merge "Do not perform backup/restore of instant apps" into oc-dev

services/backup/java/com/android/server/backup/BackupManagerService.java

@@ -790,6 +790,11 @@ public class BackupManagerService {
             return false;
         }
 
+        // 4. it is an "instant" app
+        if (app.isInstantApp()) {
+            return false;
+        }
+
         // Everything else checks out; the only remaining roadblock would be if the
         // package were disabled
         return !appIsDisabled(app, pm);