Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev am: 793c634d am: c9db008a Change-Id: Id570a2ca59e7055af865e7f886663ed4ed2eca99