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

Change-Id: I95c4984f1f5cfbacbda9039cac0f6ce06a8419d5