Merge "[automerger skipped] Merge "New CTS test: WallpaperManager, test for 1x1 pixel bitmaps." into pie-cts-dev am: d2a0af367f  -s ours"
am: 529f2528ab  -s ours

Change-Id: I73df1623c17867fe4e70ffe2d6e60156d26801d6