Migrate system+lock wallpaper to lock-only when setting live wp am: 7cd0010df6
am: 9ee86cb987

Change-Id: I7d293d3d3cc0f60b0a3ce88ce9400db9d46fa20a