Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
am: 119840eb91

Change-Id: I16436af5b7ada58113d846b9836d302061730177