Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b31310" into oc-dr1-dev-plus-aosp
am: 5d8f843c2c

Change-Id: Ic5bb317fc3cff648dec1174df536033a8ab0f217