Revert "Merge commit 'refs/changes/42/2374342/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into dots-color"

This reverts commit 0316c12062d5c091fe82700661d19f39018cb075.

Change-Id: I166af3bd287b0c9c0aad6430c0f9ec50961c8f3c
7 files changed