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

Change-Id: I668b773e09a35c0b896c09009e0efc9c9fe62067