[automerger skipped] Merge "Disallow too large display padding for wallpaper"...

[automerger skipped] Merge "Disallow too large display padding for wallpaper" into sc-v2-dev am: 360e11ff am: 8ce2b18f -s ours

am skip reason: Merged-In I471fb3546bdd2f9aa07dd091fe841b2bc5c484d6 with SHA-1 f6b503a8 is already in history

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



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