[automerger] More launcher grid updates. am: 3f9bab2fe4

Change-Id: I1f2507401fb8a0ea961fa1b2280d2d5f15a0b085