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
am: d3484dac7f  -s ours

Change-Id: Ia2250e70c187f0b7ade0b1f344a7507ba089f70c