[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into pi-dev am: b92ba1bd57 -s ours
am: 46c40154ad

Change-Id: I9a7c0a0fdd6cf8acb686ce28532a6bd56239e3a6