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

Change-Id: I7b6e15910762f9f7ef2b3576778e3f00fc7dd5cd