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

Change-Id: Idf6c540baa337eec7c2c23ac5c1b27ded3c3adc0