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

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



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