[automerger] Merge commit 'refs/changes/84/2659484/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-860fd7dd-f3a3-4500-8fc2-78d473322b94 am: 3b7c865e04

Change-Id: I2de03214f2208d2af4c61b453e454a86aacc0159