Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in SwipeHelper class 2. Make few instance variables final Bug: 62466540" into ub-launcher3-dorval-polish
am: 226b26e73e

Change-Id: I240b41ff9e838637f3c3f1a48c64885f102dbf15