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

Change-Id: I388496b56e078b49637e1edd80e9f0b2733f1c9b