Merge "Disallow too large display padding for wallpaper" into sc-v2-dev am: 360e11ff

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



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