Merge "Fix WallpaperManager APIs" into nyc-mr1-dev am: 7baf677ded
am: 37298f15a9

Change-Id: Ia3ef7a19427474ffa68ee20378d4ce9ce34a2c05