Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b313" into oc-dr1-dev-plus-aosp