Merge "Replace use of java.util.HashMap with android.util.ArrayMap in AddWorkspaceItemsTask class Bug: 62466540" into ub-launcher3-dorval-polish