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

Merge "Avoid applying weird wallpaper offset" into udc-dev am: 48f4fbfa am: 9d1869e0 am: 3106f081 am: bb2c5a08

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



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