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

Change-Id: Ie1b893b0bfda5e73c493c85a86dd5c44cbbae0cc