Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev