[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while...

[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev am: 17fd6580 am: 9c9c1c0f am: 7c50686c -s ours am: a234d64d -s ours am: 76e1059b am: 0eef3050 am: 55058c3d
am: 9d627e9a -s ours
am skip reason: subject contains skip directive

Change-Id: I2c227c4c496a6a66788dc091cf467d5985254e6b