[automerger skipped] Merge "Disallow too large display padding for wallpaper" into sc-v2-dev am: 360e11ff90 am: 8ce2b18f39 -s ours am: 8629d70ac7 -s ours am: 9447075100 -s ours
am skip reason: Merged-In I471fb3546bdd2f9aa07dd091fe841b2bc5c484d6 with SHA-1 f6b503a8c1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16405924
Change-Id: Id38a1add80182aec294f071e02ca59a6be48556c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: