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

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

Change-Id: Ifa9b2f37ec4478880d13052b4444746d85c03bd4