Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274 am: a1d274c92a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521640

Change-Id: I2bfe69996c6113dfbd6ae1b2d993b78c940b507c