Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev
am: 3d141421f8

Change-Id: Ic1216b5ace91e0284015d5b6fc6cc5252dbab876