Merge "ImageWallpaper density and bug fix" into sc-dev am: fcfa35e119

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

Change-Id: I98da55db6eb12417844e4aab426878baf4272b90