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

Merge "Avoid applying weird wallpaper offset" into udc-dev am: 48f4fbfa am: 82b6bbc3 am: 448350d6

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



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