[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev am: 17fd658061 am: 9c9c1c0f8a
am: 7c50686c92 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c0d041dada006775e7fab48e312d61c3ee5f492