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

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



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