Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev
am: 793c634d1e

Change-Id: I11f490cd67f31816abf0ed4dbed481eb9b21d6cf