Merge "Regularize some wallpaper APIs" into pi-dev
am: 17b6490ce1

Change-Id: I3ce564689cea8a2172dc682813c7bd0dcec3b199