[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into pi-dev
am: b92ba1bd57 -s ours
am skip reason: subject contains skip directive

Change-Id: I5a1adc8590c03971a0dbee8f461162ed123450a5