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

Change-Id: I0bfa8d50d88b09316c6efe8d8db16686ce0d300d