Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in PackageUpdatedTask class 2. Get rid of explicit type arguments that can be inferred" into ub-launcher3-dorval-polish
am: ef66cdbca4

Change-Id: Iab60e68c1ad1a6e38167ed35ba9978a5ecbe4db2