resolved conflicts for merge of b564efb0 to ub-launcher3-master

Change-Id: I4321522dd1b6b3f96e21232d113fad5144b630bc

diff --cc src/com/android/launcher3/AutoInstallsLayout.java
Simple merge

diff --cc src/com/android/launcher3/DefaultLayoutParser.java
index 4837238,986ae81..6c3008b
--- 1/src/com/android/launcher3/DefaultLayoutParser.java
--- 2/src/com/android/launcher3/DefaultLayoutParser.java
+++ b/src/com/android/launcher3/DefaultLayoutParser.java
@@@ -36,10 -35,8 +35,8 @@@ public class DefaultLayoutParser extend
      private static final String TAG_SHORTCUT = "shortcut";
      private static final String TAG_FOLDER = "folder";
      private static final String TAG_PARTNER_FOLDER = "partner-folder";
-     private static final String TAG_INCLUDE = "include";
  
 -    private static final String ATTR_URI = "uri";
 +    protected static final String ATTR_URI = "uri";
-     private static final String ATTR_WORKSPACE = "workspace";
      private static final String ATTR_CONTAINER = "container";
      private static final String ATTR_SCREEN = "screen";
      private static final String ATTR_FOLDER_ITEMS = "folderItems";