Merge "WallpaperColors caching and synchronization" into oc-dr1-dev
am: bd17b31310

Change-Id: If36e86322bbf8573c87d84a9ec15a350bb3f60db