Merge "Do not extract colors of live wallpapers." into oc-dr1-dev
am: 68b8d34e94

Change-Id: Ib62c0fafc328e862f9051b9164c7c199bb1d2c90