Merge "Avoid applying weird wallpaper offset" into udc-dev am: 48f4fbfa am: 1efdf81f

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



Change-Id: Ib2b77d4ab6740b2b118eefa248b570911a867887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>