Merge "Hide WallpaperService.Engine colors API." into oc-dr1-dev am: 1133cf2b8a
am: edc2917b69

Change-Id: Id25fbbca90dbac2b4149c5aaa6ca3d3ee4c8b537