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

Change-Id: I11ccb843c335ac36a1fde83b92263d412666995b