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 am: 2091291f

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



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