Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final" into ub-launcher3-dorval-polish