[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
am: 682c0691b7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib50742554632b400eee2afd8a0af960733205c25