Merge "Merge "WallpaperColors refactor" into oc-dr1-dev am: 04d2ec59e8" into oc-dr1-dev-plus-aosp
am: fcee629aa6

Change-Id: Idf98ceb1465c1e83de1cc5c0aa46077289ed2f6d