Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in CellLayout class 2. Get rid of explicit type arguments that can be inferred 3. Make instance variables final Bug: 62466540" into ub-launcher3-dorval-polish
am: 81d8a3dd22

Change-Id: I7d778d7f73c5a5cfc51cc12d8bae83eef6ec1695